diff options
| author | Jason Chan <jason.chan@10gen.com> | 2020-03-09 13:45:21 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-26 18:09:46 +0000 |
| commit | 811f09d0ad833e7fbeeb1d0a332134b180f5a032 (patch) | |
| tree | 04dc07a4166b797812f5961106e819121031168b | |
| parent | 238c485dbbbdb370312ace5c32bcaf5370ad0647 (diff) | |
| download | mongo-811f09d0ad833e7fbeeb1d0a332134b180f5a032.tar.gz | |
SERVER-46369 Run mixed_version_replica_sets.js in required builder
(cherry picked from commit c646b5413e57e97a6cdee224d76c00a21912b23d)
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/replicaset.py | 8 | ||||
| -rw-r--r-- | etc/evergreen.yml | 11 | ||||
| -rw-r--r-- | jstests/core/mixed_version_replica_set.js | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/replicaset.py b/buildscripts/resmokelib/testing/fixtures/replicaset.py index 246fa3b4f22..cfeff2c706f 100644 --- a/buildscripts/resmokelib/testing/fixtures/replicaset.py +++ b/buildscripts/resmokelib/testing/fixtures/replicaset.py @@ -131,6 +131,14 @@ class ReplicaSetFixture(interface.ReplFixture): # pylint: disable=too-many-inst self.initial_sync_node.setup() self.initial_sync_node.await_ready() + if self.mixed_bin_versions: + for i in range(self.num_nodes): + if self.nodes[i].mongod_executable != self.mixed_bin_versions[i]: + msg = (f"Executable of node{i}: {self.nodes[i].mongod_executable} does not " + f"match the executable assigned by mixedBinVersions: " + f"{self.mixed_bin_versions[i]}.") + raise errors.ServerFailure(msg) + # We need only to wait to connect to the first node of the replica set because we first # initiate it as a single node replica set. self.nodes[0].await_ready() diff --git a/etc/evergreen.yml b/etc/evergreen.yml index aa4f6446db4..4e5165899da 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -5271,6 +5271,16 @@ tasks: resmoke_args: "--storageEngine=wiredTiger --mongodSetParameters='{logComponentVerbosity: {command: 2}}'" name: jstestfuzz_sharded_session +## Tests that the multiversion test generation logic is not broken. +- name: multiversion_sanity_check_gen + commands: + - func: "generate multiversion tasks" + vars: + suite: replica_sets_jscore_passthrough + resmoke_args: --storageEngine=wiredTiger --includeWithAnyTags=multiversion_sanity_check + task_path_suffix: /data/multiversion + fallback_num_sub_suites: 1 + - name: replica_sets_jscore_multiversion_passthrough_gen tags: ["multiversion_passthrough"] commands: @@ -9882,6 +9892,7 @@ buildvariants: - name: jsonSchema - name: .jstestfuzz !.flow_control # Flow control jstestfuzz take longer. - name: libunwind_tests + - name: multiversion_sanity_check_gen - name: mqlrun - name: .multi_shard - name: multi_stmt_txn_jscore_passthrough_with_migration_gen diff --git a/jstests/core/mixed_version_replica_set.js b/jstests/core/mixed_version_replica_set.js index 7c8cf831af1..a370ab52333 100644 --- a/jstests/core/mixed_version_replica_set.js +++ b/jstests/core/mixed_version_replica_set.js @@ -1,6 +1,7 @@ /** * Tests initializing a mixed version replica set through resmoke. * + * @tags: [multiversion_sanity_check] */ (function() { |