summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierlauro Sciarelli <pierlauro.sciarelli@mongodb.com>2021-10-25 11:55:05 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-10-26 12:00:53 +0000
commit5c466f92034e113ac3006b956492a7b51c0a6644 (patch)
tree7ffc045d56b3478550601245d05def6f962f32b6
parentfb199b640b0419b5f6189f48b62508a98bb6e812 (diff)
downloadmongo-5c466f92034e113ac3006b956492a7b51c0a6644.tar.gz
SERVER-60961 Add exclude tags to old branches not generating multiversion_exclude_tags.yml
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion_auth.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml5
3 files changed, 13 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 8eb9be92751..7b1e6d1f3b6 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -15,6 +15,10 @@ selector:
- jstests/multiVersion/dumprestore.js
- jstests/multiVersion/dumprestore_sharded.js
+ exclude_with_any_tags:
+ - multiversion_incompatible
+ - requires_fcv_42
+
# Multiversion tests start their own mongod's.
executor:
config:
diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
index f3640884d0d..639089fe1a8 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -22,6 +22,10 @@ selector:
# Skip any tests that run with auth explicitly.
- jstests/multiVersion/load_keys_on_upgrade.js
+ exclude_with_any_tags:
+ - multiversion_incompatible
+ - requires_fcv_42
+
# Multiversion tests start their own mongod's.
executor:
config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 49e017e2514..03c009ff055 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -136,6 +136,11 @@ selector:
- jstests/sharding/retryable_mongos_write_errors.js
# Requires the fix for SERVER-58104 which was not backported to 3.6.
- jstests/sharding/balancing_sessions_collection_reshard.js
+
+ exclude_with_any_tags:
+ - multiversion_incompatible
+ - requires_fcv_42
+
executor:
config:
shell_options: