SERVER-42883 Generate change streams multiversion suites

mongodb · Nov 4, 2019 · 56866f4 · 56866f4
1 parent ad3a6eb
commit 56866f4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py
@@ -76,7 +76,7 @@ def update_suite_config_for_multiversion_sharded(suite_config):
 
     if base_num_shards is not default_shards or base_num_rs_nodes_per_shard is not default_num_nodes:
         num_shard_num_nodes_pair = "{}-{}".format(base_num_shards, base_num_rs_nodes_per_shard)
-        assert num_shard_num_nodes_pair in {"default_shards-2"}, \
+        assert num_shard_num_nodes_pair in {"default_shards-2", "2-default_nodes"}, \
                "The multiversion suite runs sharded clusters with 2 shards and 2 nodes per shard. "\
                " acceptable, please add '{}' to this assert.".format(num_shard_num_nodes_pair)
 

diff --git a/buildscripts/resmokeconfig/suites/change_streams.yml b/buildscripts/resmokeconfig/suites/change_streams.yml
@@ -1,4 +1,5 @@
 test_kind: js_test
+use_in_multiversion_burn_in_tests: true
 
 selector:
   roots:

diff --git a/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml b/buildscripts/resmokeconfig/suites/change_streams_sharded_collections_passthrough.yml
@@ -1,4 +1,5 @@
 test_kind: js_test
+use_in_multiversion_burn_in_tests: true
 
 selector:
   roots:

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
@@ -6159,6 +6159,17 @@ tasks:
     vars:
       resmoke_args: --suites=change_streams --storageEngine=wiredTiger
 
+- <<: *task_template
+  name: change_streams_multiversion_gen
+  tags: ["multiversion_passthrough"]
+  commands:
+  - func: "generate multiversion tasks"
+    vars:
+      suite: change_streams
+      resmoke_args: --storageEngine=wiredTiger
+      task_path_suffix: /data/multiversion
+      fallback_num_sub_suites: 4
+
 - <<: *task_template
   name: change_streams_mongos_sessions_passthrough
   tags: ["change_streams"]
@@ -6203,6 +6214,19 @@ tasks:
     vars:
       resmoke_args: --suites=change_streams_sharded_collections_passthrough --storageEngine=wiredTiger
 
+- <<: *task_template
+  name: change_streams_sharded_collections_multiversion_passthrough_gen
+  tags: ["multiversion_passthrough"]
+  depends_on:
+  - name: change_streams_multiversion_gen
+  commands:
+  - func: "generate multiversion tasks"
+    vars:
+      suite: change_streams_sharded_collections_passthrough
+      resmoke_args: --storageEngine=wiredTiger
+      task_path_suffix: /data/multiversion
+      fallback_num_sub_suites: 4
+
 - <<: *task_template
   name: change_streams_whole_db_passthrough
   tags: ["change_streams"]