summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chan <jason.chan@10gen.com>2020-02-28 13:44:43 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-03-09 15:52:46 +0000
commit3383520ebf9111985bffa791ee945854205bf6c7 (patch)
tree4354198cced88eade65e53644cc2a223de473bb2
parentafad879071031c61013e3f58248adcc9f9f5d1c6 (diff)
downloadmongo-3383520ebf9111985bffa791ee945854205bf6c7.tar.gz
SERVER-46369 Run mixed_version_replica_sets.js in required builder
-rw-r--r--buildscripts/resmokelib/testing/fixtures/replicaset.py8
-rw-r--r--etc/evergreen.yml12
-rw-r--r--jstests/core/mixed_version_replica_set.js1
3 files changed, 21 insertions, 0 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/replicaset.py b/buildscripts/resmokelib/testing/fixtures/replicaset.py
index aee90aad4cb..0dfe909694b 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 0ea131ce549..ad685e0d9b0 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -5269,6 +5269,17 @@ 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
+ tags: ["multiversion_passthrough"]
+ 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: 4
+
- name: replica_sets_jscore_multiversion_passthrough_gen
tags: ["multiversion_passthrough"]
commands:
@@ -9875,6 +9886,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() {