SERVER-29398 add mode to combine_report.py to not signal test failure with exit code

2 files changed, 10 insertions, 2 deletions

diff --git a/buildscripts/combine_reports.py b/buildscripts/combine_reports.py
index 22a966340ab..d7fe0eb5ece 100755
--- a/buildscripts/combine_reports.py
+++ b/buildscripts/combine_reports.py
@@ -51,6 +51,11 @@ def main():
                       dest="ignore_missing",
                       action="store_true",
                       help="Ignore any input report file that does not exist.")
+    parser.add_option("-x", "--no-report-exit",
+                      dest="report_exit",
+                      default=True,
+                      action="store_false",
+                      help="Do not exit with a non-zero code if any test in the report fails.")
 
     (options, args) = parser.parse_args()
 
@@ -78,7 +83,10 @@ def main():
     else:
         print(json.dumps(combined_report))
 
-    sys.exit(report_exit(combined_test_report))
+    if options.report_exit:
+        sys.exit(report_exit(combined_test_report))
+    else:
+        sys.exit(0)
 
 
 if __name__ == "__main__":
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 308d7c6fb04..adc86814176 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1035,7 +1035,7 @@ post:
     params:
       working_dir: src
       script: |
-        ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/combine_reports.py -m -o report.json report_reliable.json report_unreliable.json
+        ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/combine_reports.py -m -x -o report.json report_reliable.json report_unreliable.json
   - command: attach.results
     params:
       file_location: src/report.json