summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishnu Kaushik <vishnu.kaushik@mongodb.com>2021-09-20 21:27:12 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-09-20 21:49:09 +0000
commitf9a38501bc743dca7820c8eddd018eb2f37f7b89 (patch)
tree23bba05cb54ac9d80b080f7bea5f4ca63dcc1b5a
parent6f895e6289a1aa26f74fe622a3afafdba2a73154 (diff)
downloadmongo-f9a38501bc743dca7820c8eddd018eb2f37f7b89.tar.gz
SERVER-59737 Remove the disabled_due_to_server_58295 tag from test infrastructure config files
-rw-r--r--buildscripts/resmokeconfig/suites/feature_flag_multiversion.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/multiversion_auth.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_lts_mongos_and_mixed_shards.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_multiversion.yml1
-rw-r--r--etc/evergreen.yml4
7 files changed, 2 insertions, 9 deletions
diff --git a/buildscripts/resmokeconfig/suites/feature_flag_multiversion.yml b/buildscripts/resmokeconfig/suites/feature_flag_multiversion.yml
index 7450847bad8..86d66750a49 100644
--- a/buildscripts/resmokeconfig/suites/feature_flag_multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/feature_flag_multiversion.yml
@@ -5,8 +5,6 @@ test_kind: js_test
selector:
roots:
- jstests/multiVersion/genericSetFCVUsage/run_feature_flag_multiversion_test.js
- exclude_with_any_tags:
- - disabled_due_to_server_58295
# Multiversion tests start their own mongod's.
executor:
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index 95a821c15c1..a3692f67a7d 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -20,7 +20,6 @@ selector:
exclude_with_any_tags:
- featureFlagToaster
- featureFlagSpoon
- - disabled_due_to_server_58295
# Multiversion tests start their own mongod's.
executor:
diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
index a4ba52a8b83..3f6476922bb 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -33,7 +33,6 @@ selector:
exclude_with_any_tags:
- featureFlagToaster
- featureFlagSpoon
- - disabled_due_to_server_58295
# Multiversion tests start their own mongod's.
executor:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml b/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml
index e587fa8107a..a83ebb1e5e4 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multiversion.yml
@@ -10,7 +10,6 @@ selector:
- requires_fcv_51
- backport_required_multiversion
- replica_sets_multiversion_backport_required_multiversion
- - disabled_due_to_server_58295
exclude_files:
- jstests/replsets/initial_sync_rename_collection.js
- jstests/replsets/initial_sync_drop_collection.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_lts_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_lts_mongos_and_mixed_shards.yml
index 6962ab75ca4..90ebcad98db 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_lts_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_lts_mongos_and_mixed_shards.yml
@@ -13,7 +13,6 @@ selector:
- requires_fcv_51
- backport_required_multiversion
- sharding_last_lts_mongos_and_mixed_shards_backport_required_multiversion
- - disabled_due_to_server_58295
exclude_files:
# SERVER-33683: We added a restriction on using an aggregation within a transaction against
# mongos. This should be removed and the test can be adjusted and re-added to this passthrough.
diff --git a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
index 0ab1b77d1e8..3ae8023351f 100644
--- a/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_multiversion.yml
@@ -12,7 +12,6 @@ selector:
- requires_fcv_51
- backport_required_multiversion
- replica_sets_multiversion_backport_required_multiversion
- - disabled_due_to_server_58295
exclude_files:
# Enable when 4.6 becomes last stable
- jstests/sharding/query/merge_command_options.js
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 2af9a1ef0bc..b97e90bae31 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9560,7 +9560,7 @@ buildvariants:
# TODO (SERVER-55857): Remove 'requires_fcv_51' once tests are filtered out using the
# 'REQUIRES_FCV_TAG' list in 'multiversion_constants.py'.
test_flags: >-
- --excludeWithAnyTags=requires_fcv_51,multiversion_incompatible,disabled_due_to_server_58295
+ --excludeWithAnyTags=requires_fcv_51,multiversion_incompatible
compile_flags: >-
-j$(grep -c ^processor /proc/cpuinfo)
--ssl
@@ -9591,7 +9591,7 @@ buildvariants:
# TODO (SERVER-55857): Remove 'requires_fcv_51' once tests are filtered out using the
# 'REQUIRES_FCV_TAG' list in 'multiversion_constants.py'.
test_flags: >-
- --excludeWithAnyTags=requires_fcv_51,multiversion_incompatible,disabled_due_to_server_58295
+ --excludeWithAnyTags=requires_fcv_51,multiversion_incompatible
--runAllFeatureFlagTests
--mongodSetParameters="{internalQueryEnableSlotBasedExecutionEngine: true}"