Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 10 insertions, 56 deletions

diff --git a/buildscripts/resmokelib/run/__init__.py b/buildscripts/resmokelib/run/__init__.py
index 20ff72c2c79..420825bfec4 100644
--- a/buildscripts/resmokelib/run/__init__.py
+++ b/buildscripts/resmokelib/run/__init__.py
@@ -385,25 +385,12 @@ class TestRunnerEvg(TestRunner):
     additional options for running unreliable tests in Evergreen.
     """
 
-    UNRELIABLE_TAG = _TagInfo(
-        tag_name="unreliable",
-        evergreen_aware=True,
-        suite_options=config.SuiteOptions.ALL_INHERITED._replace(  # type: ignore
-            report_failure_status="silentfail"))
-
     RESOURCE_INTENSIVE_TAG = _TagInfo(
         tag_name="resource_intensive",
         evergreen_aware=False,
         suite_options=config.SuiteOptions.ALL_INHERITED._replace(  # type: ignore
             num_jobs=1))
 
-    RETRY_ON_FAILURE_TAG = _TagInfo(
-        tag_name="retry_on_failure",
-        evergreen_aware=True,
-        suite_options=config.SuiteOptions.ALL_INHERITED._replace(  # type: ignore
-            fail_fast=False, num_repeat_suites=2, num_repeat_tests=1,
-            report_failure_status="silentfail"))
-
     @staticmethod
     def _make_evergreen_aware_tags(tag_name):
         """Return a list of resmoke.py tags.
@@ -438,29 +425,8 @@ class TestRunnerEvg(TestRunner):
 
         combinations = []
 
-        if config.EVERGREEN_PATCH_BUILD:
-            combinations.append(("unreliable and resource intensive",
-                                 ((cls.UNRELIABLE_TAG, True), (cls.RESOURCE_INTENSIVE_TAG, True))))
-            combinations.append(("unreliable and not resource intensive",
-                                 ((cls.UNRELIABLE_TAG, True), (cls.RESOURCE_INTENSIVE_TAG, False))))
-            combinations.append(("reliable and resource intensive",
-                                 ((cls.UNRELIABLE_TAG, False), (cls.RESOURCE_INTENSIVE_TAG, True))))
-            combinations.append(("reliable and not resource intensive",
-                                 ((cls.UNRELIABLE_TAG, False), (cls.RESOURCE_INTENSIVE_TAG,
-                                                                False))))
-        else:
-            combinations.append(("retry on failure and resource intensive",
-                                 ((cls.RETRY_ON_FAILURE_TAG, True), (cls.RESOURCE_INTENSIVE_TAG,
-                                                                     True))))
-            combinations.append(("retry on failure and not resource intensive",
-                                 ((cls.RETRY_ON_FAILURE_TAG, True), (cls.RESOURCE_INTENSIVE_TAG,
-                                                                     False))))
-            combinations.append(("run once and resource intensive",
-                                 ((cls.RETRY_ON_FAILURE_TAG, False), (cls.RESOURCE_INTENSIVE_TAG,
-                                                                      True))))
-            combinations.append(("run once and not resource intensive",
-                                 ((cls.RETRY_ON_FAILURE_TAG, False), (cls.RESOURCE_INTENSIVE_TAG,
-                                                                      False))))
+        combinations.append(("resource intensive", [(cls.RESOURCE_INTENSIVE_TAG, True)]))
+        combinations.append(("not resource intensive", [(cls.RESOURCE_INTENSIVE_TAG, False)]))
 
         return combinations
 
@@ -740,15 +706,19 @@ class RunPlugin(PluginInterface):
         )
 
         parser.add_argument(
-            "--runAllFeatureFlagsNoTests", dest="run_all_feature_flags_no_tests",
-            action="store_true", help=
-            "Run MongoDB servers with all feature flags enabled but don't run any tests tagged with these feature flags; used for multiversion suites"
-        )
+            "--runNoFeatureFlagTests", dest="run_no_feature_flag_tests", action="store_true",
+            help=("Do not run any tests tagged with enabled feature flags."
+                  " This argument has precedence over --runAllFeatureFlagTests"
+                  "; used for multiversion suites"))
 
         parser.add_argument("--additionalFeatureFlags", dest="additional_feature_flags",
                             action="append", metavar="featureFlag1, featureFlag2, ...",
                             help="Additional feature flags")
 
+        parser.add_argument("--additionalFeatureFlagsFile", dest="additional_feature_flags_file",
+                            action="store", metavar="FILE",
+                            help="The path to a file with feature flags, delimited by newlines.")
+
         parser.add_argument("--maxTestQueueSize", type=int, dest="max_test_queue_size",
                             help=argparse.SUPPRESS)
 
@@ -879,13 +849,6 @@ class RunPlugin(PluginInterface):
                                       help="Writes a JSON file with performance test results.")
 
         internal_options.add_argument(
-            "--reportFailureStatus", action="store", dest="report_failure_status",
-            choices=("fail", "silentfail"), metavar="STATUS",
-            help="Controls if the test failure status should be reported as failed"
-            " or be silently ignored (STATUS=silentfail). Dynamic test failures will"
-            " never be silently ignored. Defaults to STATUS=%(default)s.")
-
-        internal_options.add_argument(
             "--reportFile", dest="report_file", metavar="REPORT",
             help="Writes a JSON file with test status and timing information.")
 
@@ -1096,15 +1059,6 @@ def to_local_args(input_args=None):  # pylint: disable=too-many-branches,too-man
     if origin_suite is not None:
         setattr(parsed_args, "suite_files", origin_suite)
 
-    # Replace --runAllFeatureFlagTests with an explicit list of feature flags. The former relies on
-    # all_feature_flags.txt which may not exist in the local dev environment.
-    run_all_feature_flag_tests = getattr(parsed_args, "run_all_feature_flag_tests", None)
-    if run_all_feature_flag_tests is not None:
-        setattr(parsed_args, "additional_feature_flags", config.ENABLED_FEATURE_FLAGS)
-        del parsed_args.run_all_feature_flag_tests
-
-    del parsed_args.run_all_feature_flags_no_tests
-
     # The top-level parser has one subparser that contains all subcommand parsers.
     command_subparser = [
         action for action in parser._actions  # pylint: disable=protected-access