SERVER-87898: Prepare server for FCV 8.1 upgrade (#20740)

GitOrigin-RevId: 0a8d8383477d3c96c5443e33242da2d74620ca21
percona · Apr 3, 2024 · fb78dc7 · fb78dc7
1 parent 3a67828
commit fb78dc7
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 2,426 deletions.
diff --git a/...scripts/resmokeconfig/matrix_suites/generated_suites/multiversion_auth_future_git_tag.yml b/...scripts/resmokeconfig/matrix_suites/generated_suites/multiversion_auth_future_git_tag.yml
@@ -32,7 +32,6 @@ selector:
   - jstests/multiVersion/genericBinVersion/minor_version_tags_new_old_new.js
   - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js
   - jstests/multiVersion/genericBinVersion/load_keys_on_upgrade.js
-  - jstests/multiVersion/targetedTestsLastLtsFeatures/oidc_multipurpose_idp.js
   exclude_with_any_tags:
   - DISABLED_TEMPORARILY_DUE_TO_FCV_UPGRADE
   roots:

diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml
@@ -149,7 +149,6 @@
 
         # Skip any tests that run with auth explicitly.
         - jstests/multiVersion/genericBinVersion/load_keys_on_upgrade.js
-        - jstests/multiVersion/targetedTestsLastLtsFeatures/oidc_multipurpose_idp.js
       exclude_with_any_tags:
         - DISABLED_TEMPORARILY_DUE_TO_FCV_UPGRADE
     executor:

diff --git a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_replica_sets_jscore_passthrough.yml
@@ -28,6 +28,7 @@ selector:
   - requires_fcv_72
   - requires_fcv_73
   - requires_fcv_80
+  - requires_fcv_81
   # Exclude tests that are not compatible with upgrade/downgrade.
   - cannot_run_during_upgrade_downgrade
 

diff --git a/...pts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml b/...pts/resmokeconfig/suites/fcv_upgrade_downgrade_sharded_collections_jscore_passthrough.yml
@@ -197,6 +197,7 @@ selector:
   - requires_fcv_72
   - requires_fcv_73
   - requires_fcv_80
+  - requires_fcv_81
   # Exclude tests that are not compatible with upgrade/downgrade.
   - cannot_run_during_upgrade_downgrade
 

diff --git a/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/fcv_upgrade_downgrade_sharding_jscore_passthrough.yml
@@ -150,6 +150,7 @@ selector:
   - requires_fcv_72
   - requires_fcv_73
   - requires_fcv_80
+  - requires_fcv_81
   # Exclude tests that are not compatible with upgrade/downgrade.
   - cannot_run_during_upgrade_downgrade
 

diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -21,7 +21,6 @@ selector:
 
   # Skip any tests that run with auth explicitly.
   - jstests/multiVersion/genericBinVersion/load_keys_on_upgrade.js
-  - jstests/multiVersion/targetedTestsLastLtsFeatures/oidc_multipurpose_idp.js
 
   exclude_with_any_tags:
   - featureFlagToaster

diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh
@@ -41,7 +41,7 @@ local_args="--edition $edition \
   --resmokeCmd \"python buildscripts/resmoke.py\" \
   --debug \
   ${last_lts_arg} \
-  ${last_continuous_arg} 4.2 4.4 5.0 6.0"
+  ${last_continuous_arg} 4.2 4.4 5.0 6.0 7.0"
 
 remote_invocation="${base_command} ${evergreen_args} ${local_args}"
 eval "${remote_invocation}"

diff --git a/jstests/multiVersion/downgrade_fcv_only_if_internal_transaction_is_not_prepared.js b/jstests/multiVersion/downgrade_fcv_only_if_internal_transaction_is_not_prepared.js
diff --git a/jstests/multiVersion/genericBinVersion/timeseries_collection_mixed_type.js b/jstests/multiVersion/genericBinVersion/timeseries_collection_mixed_type.js
@@ -13,6 +13,7 @@ const timeFieldName = "time";
 // Note that this list will need to be kept up to date as versions are added/dropped.
 const upgradeVersions = [
     {binVersion: "6.0", fcv: "6.0"},
+    {binVersion: "7.0", fcv: "7.0"},
     {binVersion: "last-lts", fcv: lastLTSFCV},
     {binVersion: "latest"}
 ];

diff --git a/jstests/multiVersion/genericBinVersion/truncate_retryable_write_sessions_on_downgrade.js b/jstests/multiVersion/genericBinVersion/truncate_retryable_write_sessions_on_downgrade.js
@@ -5,6 +5,8 @@
  *
  * TODO(SERVER-84271): Remove this test when featureFlagReplicateVectoredInsertsTransactionally is
  * removed.
+ *
+ * @tags: [DISABLED_TEMPORARILY_DUE_TO_FCV_UPGRADE]
  */
 
 import "jstests/multiVersion/libs/multi_rs.js";

diff --git a/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js b/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js
@@ -33,6 +33,7 @@ const versions = [
     {binVersion: '4.4', featureCompatibilityVersion: '4.4', testCollection: 'four_four'},
     {binVersion: '5.0', featureCompatibilityVersion: '5.0', testCollection: 'five_zero'},
     {binVersion: '6.0', featureCompatibilityVersion: '6.0', testCollection: 'six_zero'},
+    {binVersion: '7.0', featureCompatibilityVersion: '7.0', testCollection: 'seven_zero'},
     {binVersion: 'last-lts', featureCompatibilityVersion: lastLTSFCV, testCollection: 'last_lts'},
     {
         binVersion: 'last-continuous',

diff --git a/jstests/multiVersion/libs/dbcheck_old_format_keys_test.js b/jstests/multiVersion/libs/dbcheck_old_format_keys_test.js
@@ -26,7 +26,8 @@ const upgradeVersions = {
     "4.4": {"fcv": "5.0", "nextVersion": "5.0"},
     "5.0": {"fcv": "6.0", "nextVersion": "6.0"},
     "6.0": {"fcv": "7.0", "nextVersion": "7.0"},
-    "7.0": {"fcv": "8.0", "nextVersion": "latest"},
+    "7.0": {"fcv": "8.0", "nextVersion": "8.0"},
+    "8.0": {"fcv": "8.1", "nextVersion": "latest"},
     // TODO (SERVER-66611): Automate modifying this list.
     "latest": {}
 }

diff --git a/jstests/multiVersion/targetedTestsLastLtsFeatures/bindata_convert_view_upgrade_downgrade.js b/jstests/multiVersion/targetedTestsLastLtsFeatures/bindata_convert_view_upgrade_downgrade.js