diff options
6 files changed, 29 insertions, 18 deletions
diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py index 1bb2dff1e24..7d5b9904317 100755 --- a/buildscripts/evergreen_gen_multiversion_tests.py +++ b/buildscripts/evergreen_gen_multiversion_tests.py @@ -68,10 +68,11 @@ def update_suite_config_for_multiversion_sharded(suite_config): fixture_config = suite_config["executor"]["fixture"] default_shards = "default_shards" default_num_nodes = "default_nodes" - base_num_shards = (default_shards - if "num_shards" not in fixture_config else fixture_config["num_shards"]) + base_num_shards = (default_shards if "num_shards" not in fixture_config + or not fixture_config["num_shards"] else fixture_config["num_shards"]) base_num_rs_nodes_per_shard = (default_num_nodes - if "num_rs_nodes_per_shard" not in fixture_config else + if "num_rs_nodes_per_shard" not in fixture_config + or not fixture_config["num_rs_nodes_per_shard"] else fixture_config["num_rs_nodes_per_shard"]) if base_num_shards is not default_shards or base_num_rs_nodes_per_shard is not default_num_nodes: diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml index 2f964f507c9..7888ed54adc 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml @@ -1,5 +1,4 @@ test_kind: js_test -use_in_multiversion_burn_in_tests: true # This suite's blacklist is a sharded_collections_jscore_passthrough blacklist with some additions # from causally_consistent_jscore_passthrough blacklist. diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml index 03e971ca184..3af3de1ed3b 100644 --- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml @@ -1,4 +1,5 @@ test_kind: js_test +use_in_multiversion_burn_in_tests: true selector: roots: diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml index 1667f75db9b..69b17329dce 100644 --- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml @@ -1,4 +1,5 @@ test_kind: js_test +use_in_multiversion_burn_in_tests: true selector: roots: diff --git a/buildscripts/tests/test_burn_in_tests.py b/buildscripts/tests/test_burn_in_tests.py index a8157f6d4dd..18d13c255fe 100644 --- a/buildscripts/tests/test_burn_in_tests.py +++ b/buildscripts/tests/test_burn_in_tests.py @@ -37,9 +37,7 @@ def create_tests_by_task_mock(n_tasks, n_tests): } -MV_MOCK_SUITES = [ - "replica_sets_jscore_passthrough", "sharded_causally_consistent_jscore_passthrough" -] +MV_MOCK_SUITES = ["replica_sets_jscore_passthrough", "sharding_jscore_passthrough"] def create_multiversion_tests_by_task_mock(n_tasks, n_tests): diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 546c40d91f7..9e5b76e26f1 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -6994,6 +6994,17 @@ tasks: resmoke_args: --suites=sharded_collections_jscore_passthrough --storageEngine=wiredTiger - <<: *task_template + name: sharded_collections_jscore_multiversion_passthrough_gen + tags: ["multiversion_passthrough"] + commands: + - func: "generate multiversion tasks" + vars: + suite: sharded_collections_jscore_passthrough + resmoke_args: --storageEngine=wiredTiger + task_path_suffix: /data/multiversion + fallback_num_sub_suites: 4 + +- <<: *task_template name: sharding_jscore_passthrough tags: ["sharding", "jscore", "common"] depends_on: @@ -7005,6 +7016,17 @@ tasks: resmoke_args: --suites=sharding_jscore_passthrough --storageEngine=wiredTiger - <<: *task_template + name: sharding_jscore_multiversion_passthrough_gen + tags: ["multiversion_passthrough"] + commands: + - func: "generate multiversion tasks" + vars: + suite: sharding_jscore_passthrough + resmoke_args: --storageEngine=wiredTiger + task_path_suffix: /data/multiversion + fallback_num_sub_suites: 4 + +- <<: *task_template name: sharding_jscore_op_query_passthrough tags: ["sharding", "jscore"] depends_on: @@ -7753,17 +7775,6 @@ tasks: resmoke_args: --storageEngine=wiredTiger fallback_num_sub_suites: 15 -- <<: *multiversion_template - name: sharded_causally_consistent_jscore_multiversion_passthrough_gen - tags: ["multiversion_passthrough"] - commands: - - func: "generate multiversion tasks" - vars: - suite: sharded_causally_consistent_jscore_passthrough - resmoke_args: --storageEngine=wiredTiger - task_path_suffix: /data/multiversion - fallback_num_sub_suites: 4 - - name: retryable_writes_jscore_passthrough_gen tags: ["retry"] depends_on: |