diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py index 952488e158..4103f44e0f 100755 --- a/buildscripts/evergreen_gen_multiversion_tests.py +++ b/buildscripts/evergreen_gen_multiversion_tests.py @@ -91,8 +91,8 @@ def get_backports_required_last_stable_hash(task_path_suffix: str): shell_version = check_output([last_stable_shell_exec, "--version"]).decode('utf-8') last_stable_commit_hash = "" for line in shell_version.splitlines(): - if "git version" in line: - last_stable_commit_hash = line.split(':')[1].strip() + if "gitVersion" in line: + last_stable_commit_hash = line.split(':')[1].strip('"') break if not last_stable_commit_hash: raise ValueError("Could not find a valid commit hash from the last-stable mongo binary.") diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml b/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml index 1cc4e29411..d1858e975f 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml @@ -6,10 +6,6 @@ selector: exclude_with_any_tags: - multiversion_incompatible - requires_fcv_44 - exclude_files: - - jstests/replsets/*.js - # Enable when 4.4 becomes last stable - - jstests/replsets/no_disconnect_on_stepdown.js executor: config: shell_options: diff --git a/buildscripts/resmokelib/testing/fixtures/replicaset.py b/buildscripts/resmokelib/testing/fixtures/replicaset.py index 9679c27766..119c0b6822 100644 --- a/buildscripts/resmokelib/testing/fixtures/replicaset.py +++ b/buildscripts/resmokelib/testing/fixtures/replicaset.py @@ -117,7 +117,8 @@ class ReplicaSetFixture(interface.ReplFixture): # pylint: disable=too-many-inst for i in range(self.num_nodes): steady_state_constraint_param = "oplogApplicationEnforcesSteadyStateConstraints" - if steady_state_constraint_param not in self.nodes[i].mongod_options["set_parameters"]: + if (steady_state_constraint_param not in self.nodes[i].mongod_options["set_parameters"] + and self.mixed_bin_versions is not None and self.mixed_bin_versions[i] == "new"): self.nodes[i].mongod_options["set_parameters"][steady_state_constraint_param] = True if self.linear_chain and i > 0: self.nodes[i].mongod_options["set_parameters"][ diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 1322416dd7..078ea2bc24 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8907,10 +8907,10 @@ buildvariants: - name: .jstestfuzz_multiversion_gen - name: libunwind_tests - name: .logical_session_cache .one_sec -# - name: .multiversion_fuzzer -# - name: .multiversion_passthrough + - name: .multiversion_fuzzer + - name: .multiversion_passthrough - name: .ocsp -# - name: .random_multiversion_replica_sets + - name: .random_multiversion_replica_sets - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough - name: sasl @@ -10028,7 +10028,7 @@ buildvariants: - name: lint_yaml - name: lint_errorcodes - name: burn_in_tests_gen -# - name: burn_in_tests_multiversion_gen + - name: burn_in_tests_multiversion_gen - name: .aggfuzzer - name: .aggregation - name: audit @@ -10058,13 +10058,13 @@ buildvariants: - name: jsonSchema - name: .jstestfuzz !.flow_control # Flow control jstestfuzz take longer. - name: libunwind_tests -# - name: multiversion_sanity_check_gen + - name: multiversion_sanity_check_gen - name: mqlrun - name: .multi_shard - name: multi_stmt_txn_jscore_passthrough_with_migration_gen - name: multiversion_gen - name: .query_fuzzer -# - name: .random_multiversion_replica_sets + - name: .random_multiversion_replica_sets - name: .read_write_concern .large distros: - rhel62-large @@ -10264,7 +10264,7 @@ buildvariants: - name: .jstestfuzz !.flow_control - name: .logical_session_cache .repl - name: multiversion_gen -# - name: .random_multiversion_replica_sets + - name: .random_multiversion_replica_sets - name: .read_write_concern .large distros: - rhel62-large @@ -10317,9 +10317,9 @@ buildvariants: - name: compile_all_run_unittests_TG distros: - rhel62-large -# - name: .multiversion_fuzzer -# - name: .multiversion_passthrough -# - name: .random_multiversion_replica_sets + - name: .multiversion_fuzzer + - name: .multiversion_passthrough + - name: .random_multiversion_replica_sets - name: enterprise-rhel-62-64-bit-flow-control-off display_name: "Enterprise RHEL 6.2 (flow control off)" @@ -10477,10 +10477,10 @@ buildvariants: - name: .logical_session_cache .one_sec - name: .multi_shard .common - name: multiversion_gen -# - name: .multiversion_fuzzer -# - name: .multiversion_passthrough + - name: .multiversion_fuzzer + - name: .multiversion_passthrough - name: .query_fuzzer -# - name: .random_multiversion_replica_sets + - name: .random_multiversion_replica_sets - name: .read_write_concern - name: .replica_sets - name: .read_only @@ -12144,10 +12144,10 @@ buildvariants: - name: .logical_session_cache - name: .multi_shard .common - name: multiversion_gen -# - name: .multiversion_fuzzer -# - name: .multiversion_passthrough + - name: .multiversion_fuzzer + - name: .multiversion_passthrough - name: .query_fuzzer -# - name: .random_multiversion_replica_sets + - name: .random_multiversion_replica_sets - name: .read_write_concern - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough @@ -12234,9 +12234,9 @@ buildvariants: - name: .logical_session_cache .one_sec - name: .multi_shard .common - name: multiversion_gen -# - name: .multiversion_fuzzer -# - name: .multiversion_passthrough -# - name: .random_multiversion_replica_sets + - name: .multiversion_fuzzer + - name: .multiversion_passthrough + - name: .random_multiversion_replica_sets - name: .read_write_concern - name: replica_sets_large_txns_format_gen - name: replica_sets_large_txns_format_jscore_passthrough