SERVER-46931 Unblacklist/Update multiversion tests that expect "last-stable" to have a different fcv than "latest"

17 files changed, 13 insertions, 25 deletions

diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index bdfd24379df..5f0d270eb9f 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -5,8 +5,6 @@ selector:
   - jstests/multiVersion/*.js
   - jstests/multiVersion/genericSetFCVUsage/*.js
   - src/mongo/db/modules/*/jstests/hot_backups/*last_stable*.js
-  exclude_with_any_tags:
-  - fix_for_fcv_46
   exclude_files:
   # TODO: SERVER-21578
   - jstests/multiVersion/balancer_multiVersion_detect.js
@@ -21,6 +19,12 @@ selector:
   # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue.
   - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js
 
+  # TODO: SERVER-47822
+  - jstests/multiVersion/pending_chunk.js
+
+  # TODO: SERVER-47822
+  - jstests/multiVersion/migrations_with_mixed_fcv.js
+
 # 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 e942b9d65b1..4d9d8f1819d 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -9,8 +9,6 @@ selector:
   roots:
   - jstests/multiVersion/*.js
   - jstests/multiVersion/genericSetFCVUsage/*.js
-  exclude_with_any_tags:
-  - fix_for_fcv_46
   exclude_files:
   # TODO: SERVER-21578
   - jstests/multiVersion/balancer_multiVersion_detect.js
@@ -25,6 +23,12 @@ selector:
   # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue.
   - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js
 
+    # TODO: SERVER-47822
+  - jstests/multiVersion/pending_chunk.js
+
+  # TODO: SERVER-47822
+  - jstests/multiVersion/migrations_with_mixed_fcv.js
+
 # Multiversion tests start their own mongod's.
 executor:
   config:
diff --git a/jstests/multiVersion/add_invalid_shard.js b/jstests/multiVersion/add_invalid_shard.js
index 005d32d4c01..1f9dfc9c40f 100644
--- a/jstests/multiVersion/add_invalid_shard.js
+++ b/jstests/multiVersion/add_invalid_shard.js
@@ -1,7 +1,5 @@
 /**
  * Test that adding invalid or duplicate shards will fail.
- *
- * @tags: [fix_for_fcv_46]
  */
 (function() {
 
diff --git a/jstests/multiVersion/change_streams_multi_version_cluster.js b/jstests/multiVersion/change_streams_multi_version_cluster.js
index 18452ec6c1a..0237bf22dff 100644
--- a/jstests/multiVersion/change_streams_multi_version_cluster.js
+++ b/jstests/multiVersion/change_streams_multi_version_cluster.js
@@ -1,7 +1,7 @@
 // Verify that we can successfully resume a change stream during several different stages of a
 // cluster upgrade.
 //
-// @tags: [uses_change_streams, requires_replication, fix_for_fcv_46]
+// @tags: [uses_change_streams, requires_replication]
 
 // Checking UUID consistency uses cached connections, which are not valid across restarts or
 // stepdowns.
diff --git a/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js b/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
index fdfd3ab72a1..0d06214c7b9 100644
--- a/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
+++ b/jstests/multiVersion/genericSetFCVUsage/feature_compatibility_version_lagging_secondary.js
@@ -1,6 +1,5 @@
 // Tests that a primary with upgrade featureCompatibilityVersion cannot connect with a secondary
 // with a lower binary version.
-// @tags: [fix_for_fcv_46]
 (function() {
 "use strict";
 
diff --git a/jstests/multiVersion/genericSetFCVUsage/initial_sync_last_stable_from_latest.js b/jstests/multiVersion/genericSetFCVUsage/initial_sync_last_stable_from_latest.js
index 2086d7b817c..7172cb2efef 100644
--- a/jstests/multiVersion/genericSetFCVUsage/initial_sync_last_stable_from_latest.js
+++ b/jstests/multiVersion/genericSetFCVUsage/initial_sync_last_stable_from_latest.js
@@ -2,7 +2,6 @@
  * Multiversion initial sync test. Tests that initial sync succeeds when a 'last-stable' version
  * secondary syncs from a 'latest' version replica set.
  */
-// @tags: [fix_for_fcv_46]
 
 'use strict';
 
diff --git a/jstests/multiVersion/genericSetFCVUsage/migration_between_mixed_FCV_mixed_version_mongods.js b/jstests/multiVersion/genericSetFCVUsage/migration_between_mixed_FCV_mixed_version_mongods.js
index 4ce4db19ef4..fb8764c68eb 100644
--- a/jstests/multiVersion/genericSetFCVUsage/migration_between_mixed_FCV_mixed_version_mongods.js
+++ b/jstests/multiVersion/genericSetFCVUsage/migration_between_mixed_FCV_mixed_version_mongods.js
@@ -1,8 +1,6 @@
 /**
  * Test that it is not possible to move a chunk from an upgrade featureCompatibilityVersion node to
  * a downgrade binary version node.
- *
- * @tags: [fix_for_fcv_46]
  */
 
 (function() {
diff --git a/jstests/multiVersion/genericSetFCVUsage/rollback_last_stable_to_latest.js b/jstests/multiVersion/genericSetFCVUsage/rollback_last_stable_to_latest.js
index 792f8f339cd..9d3c1a60172 100644
--- a/jstests/multiVersion/genericSetFCVUsage/rollback_last_stable_to_latest.js
+++ b/jstests/multiVersion/genericSetFCVUsage/rollback_last_stable_to_latest.js
@@ -1,8 +1,6 @@
 /**
  * Multiversion rollback test. Checks that rollback succeeds between a
  * 'last-stable' version rollback node and a 'latest' version sync source.
- *
- * @tags: [fix_for_fcv_46]
  */
 
 (function() {
diff --git a/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_last_stable.js b/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_last_stable.js
index 8fe1123dca2..546065ecc5f 100644
--- a/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_last_stable.js
+++ b/jstests/multiVersion/genericSetFCVUsage/rollback_latest_to_last_stable.js
@@ -1,8 +1,6 @@
 /**
  * Multiversion rollback test. Checks that rollback succeeds between a
  * 'latest' version rollback node and a 'last-stable' version sync source.
- *
- * @tags: [fix_for_fcv_46]
  */
 
 (function() {
diff --git a/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js b/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
index efdfaf23c62..a5bad7e666c 100644
--- a/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
+++ b/jstests/multiVersion/genericSetFCVUsage/set_feature_compatibility_version.js
@@ -1,7 +1,5 @@
 /**
  * Tests setFeatureCompatibilityVersion.
- *
- * @tags: [fix_for_fcv_46]
  */
 
 // Checking UUID consistency involves talking to a shard node, which in this test is shutdown
diff --git a/jstests/multiVersion/migration_between_mixed_version_mongods.js b/jstests/multiVersion/migration_between_mixed_version_mongods.js
index bedd0e628ef..ef9b7623f6b 100644
--- a/jstests/multiVersion/migration_between_mixed_version_mongods.js
+++ b/jstests/multiVersion/migration_between_mixed_version_mongods.js
@@ -3,7 +3,6 @@
 // donor is the latest version and the recipient the last-stable, and vice versa.
 // Migrations should be successful.
 //
-// @tags: [fix_for_fcv_46]
 
 // Checking UUID consistency involves talking to a shard node, which in this test is shutdown
 TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
diff --git a/jstests/multiVersion/migrations_with_mixed_fcv.js b/jstests/multiVersion/migrations_with_mixed_fcv.js
index ec967a01f0f..da9fd28b214 100644
--- a/jstests/multiVersion/migrations_with_mixed_fcv.js
+++ b/jstests/multiVersion/migrations_with_mixed_fcv.js
@@ -1,6 +1,5 @@
 /*
  *  Tests that migrations work correctly across shards with mixed FCV state.
- *  @tags: [fix_for_fcv_46]
  */
 
 (function() {
diff --git a/jstests/multiVersion/minor_version_tags_old_new_old.js b/jstests/multiVersion/minor_version_tags_old_new_old.js
index a5f587ece78..22ce71964f9 100644
--- a/jstests/multiVersion/minor_version_tags_old_new_old.js
+++ b/jstests/multiVersion/minor_version_tags_old_new_old.js
@@ -1,4 +1,3 @@
-// @tags: [fix_for_fcv_46]
 (function() {
 'use strict';
 
diff --git a/jstests/multiVersion/mixed_replica_set_with_latest_primary.js b/jstests/multiVersion/mixed_replica_set_with_latest_primary.js
index 10802ae523a..dd5c3821ccb 100644
--- a/jstests/multiVersion/mixed_replica_set_with_latest_primary.js
+++ b/jstests/multiVersion/mixed_replica_set_with_latest_primary.js
@@ -1,7 +1,5 @@
 /**
  * Tests initializing a mixed version replica set through the shell.
- *
- * @tags: [fix_for_fcv_46]
  */
 
 (function() {
diff --git a/jstests/multiVersion/pending_chunk.js b/jstests/multiVersion/pending_chunk.js
index f581c4f6a53..5d8b938e535 100644
--- a/jstests/multiVersion/pending_chunk.js
+++ b/jstests/multiVersion/pending_chunk.js
@@ -1,6 +1,5 @@
 //
 // Tests pending chunk metadata.
-// @tags: [fix_for_fcv_46]
 //
 
 (function() {
diff --git a/jstests/multiVersion/rename_across_dbs_last_stable_secondary.js b/jstests/multiVersion/rename_across_dbs_last_stable_secondary.js
index 60aebe7f63b..1e32fbe4fbd 100644
--- a/jstests/multiVersion/rename_across_dbs_last_stable_secondary.js
+++ b/jstests/multiVersion/rename_across_dbs_last_stable_secondary.js
@@ -1,4 +1,3 @@
-// @tags: [fix_for_fcv_46]
 (function() {
 'use strict';
 
diff --git a/jstests/multiVersion/rename_across_dbs_last_stable_secondary_drop_target.js b/jstests/multiVersion/rename_across_dbs_last_stable_secondary_drop_target.js
index c646c899cf1..fea67053891 100644
--- a/jstests/multiVersion/rename_across_dbs_last_stable_secondary_drop_target.js
+++ b/jstests/multiVersion/rename_across_dbs_last_stable_secondary_drop_target.js
@@ -1,4 +1,3 @@
-// @tags: [fix_for_fcv_46]
 (function() {
 'use strict';