SERVER-92547 Use the old rhel80 variant name on v4.2 and v4.4 multiversion tests (#24894)

GitOrigin-RevId: ab976ba799c4cbc6cdd1ac8d6c1a27ba4e2012f0
2024-11-21 12:39:08 +01:00 · 2024-07-18 10:20:53 -07:00 · 2024-07-18 10:20:53 -07:00 · 3048120b43
commit 3048120b43
parent c8db5aae5c
9 changed files with 60 additions and 19 deletions
--- a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml
@ -12,7 +12,8 @@ buildvariants:
    run_on:
      - rhel8.8-small
    expansions:
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      compile_variant: *stm-daily-cron
    stepback: false
--- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml
@ -58,7 +58,8 @@ variables:
  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
  - &linux_x86_generic_expansions
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    repo_edition: enterprise
    large_distro_name: rhel8.8-medium
--- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
@ -32,7 +32,8 @@ variables:
  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
  - &linux_x86_generic_expansions
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    repo_edition: enterprise
    large_distro_name: rhel8.8-medium
@ -60,7 +61,8 @@ buildvariants:
        -j$(grep -c ^processor /proc/cpuinfo)
        --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
        --use-diagnostic-latches=on
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      scons_cache_scope: shared
      large_distro_name: rhel8.8-large
--- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
@ -84,7 +84,8 @@ variables:
  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
  - &linux_x86_generic_expansions
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    repo_edition: enterprise
    large_distro_name: rhel8.8-medium
@ -135,7 +136,8 @@ variables:
        SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique"
        CCFLAGS="-fno-gnu-unique"
      test_flags: --excludeWithAnyTags=requires_ldap_pool
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      has_packages: true
      packager_script: packager_enterprise.py
@ -592,7 +594,8 @@ buildvariants:
        --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
        --link-model=dynamic
        --use-diagnostic-latches=on
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      test_flags: >-
        --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\""
@ -639,7 +642,8 @@ buildvariants:
        --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
        --link-model=dynamic
        --use-diagnostic-latches=on
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      test_flags: >-
        --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\""
@ -726,7 +730,8 @@ buildvariants:
        --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
        --link-model=dynamic
        --use-diagnostic-latches=on
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      test_flags: >-
        --mongosSetParameters="joinIngressSessionsOnShutdown: \"true\""
--- a/etc/evergreen_yml_components/variants/rhel/test_release.yml
+++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml
@ -56,7 +56,8 @@ buildvariants:
      test_flags: >-
        --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits,requires_latch_analyzer
        --enableEnterpriseTests=off
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: targeted
      has_packages: true
      packager_script: packager.py
@ -105,7 +106,8 @@ buildvariants:
      crypt_task_compile_flags: >-
        SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique"
        CFLAGS="-fno-gnu-unique"
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      has_packages: true
      packager_script: packager_enterprise.py
--- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
+++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
@ -165,7 +165,8 @@ variables:
    num_scons_link_jobs_available: 0.99
    large_distro_name: rhel8.8-large
    xlarge_distro_name: rhel8.8-xxlarge
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov

@ -349,7 +350,8 @@ buildvariants:
        --link-model=dynamic
        --use-diagnostic-latches=on
        --modules=
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build.
      hang_analyzer_dump_core: false
@ -460,7 +462,8 @@ buildvariants:
      large_distro_name: &enterprise-rhel8-debug-tsan-large-distro-name rhel8.8-xlarge
      xlarge_distro_name: rhel8.8-xxlarge
      core_analyzer_distro_name: rhel8.8-xxlarge
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      test_flags: >-
        --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true, receiveChunkWaitForRangeDeleterTimeoutMS: 180000}"
--- a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
+++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
@ -61,7 +61,8 @@ variables:
  # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
  # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
  - &linux_x86_generic_expansions
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    repo_edition: enterprise
    large_distro_name: rhel8.8-medium
@ -121,7 +122,8 @@ variables:
    num_scons_link_jobs_available: 0.99
    large_distro_name: rhel8.8-large
    xlarge_distro_name: rhel8.8-xxlarge
-    multiversion_platform: rhel8
+    multiversion_platform: rhel80
+    multiversion_platform_50_or_later: rhel8
    multiversion_edition: enterprise
    gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov

@ -407,7 +409,8 @@ buildvariants:
        --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible
        --runAllFeatureFlagTests
        --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}"
-      multiversion_platform: rhel8
+      multiversion_platform: rhel80
+      multiversion_platform_50_or_later: rhel8
      multiversion_edition: enterprise
      resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
      scons_cache_scope: shared
--- a/evergreen/compiled_binaries_get.sh
+++ b/evergreen/compiled_binaries_get.sh
@ -19,6 +19,10 @@ architecture="${multiversion_architecture}"
 version=${project#mongodb-mongo-}
 version=${version#v}

+if [ ! -z "${multiversion_platform_50_or_later}" ]; then
+  platform="${multiversion_platform_50_or_later}"
+fi
+
 # This is primarily for tests for infrastructure which don't always need the latest
 # binaries.
 db-contrib-tool setup-repro-env \
--- a/evergreen/multiversion_setup.sh
+++ b/evergreen/multiversion_setup.sh
@ -44,14 +44,34 @@ evergreen_args="--installDir /data/install \
 local_args="--edition $edition \
  --resmokeCmd \"python buildscripts/resmoke.py\" \
  --debug \
-  ${last_lts_arg} \
-  ${last_continuous_arg} 4.2 4.4 5.0 6.0 7.0"
+  4.2 4.4"

 remote_invocation="${base_command} ${evergreen_args} ${local_args}"
 eval "${remote_invocation}"
 echo "Verbatim db-contrib-tool invocation: ${remote_invocation}"

 local_invocation="${base_command} ${local_args}"
+
+if [ ! -z "${multiversion_platform_50_or_later}" ]; then
+  platform="${multiversion_platform_50_or_later}"
+fi
+
+evergreen_args="--installDir /data/install \
+  --linkDir /data/multiversion \
+  --platform $platform \
+  --architecture $architecture \
+  --evgVersionsFile multiversion-downloads.json"
+local_args="--edition $edition \
+  --resmokeCmd \"python buildscripts/resmoke.py\" \
+  --debug \
+  ${last_lts_arg} \
+  ${last_continuous_arg} 5.0 6.0 7.0"
+
+remote_invocation="${base_command} ${evergreen_args} ${local_args}"
+eval "${remote_invocation}"
+echo "Verbatim db-contrib-tool invocation: ${remote_invocation}"
+
+local_invocation="${local_invocation} && ${base_command} ${local_args}"
 echo "Local db-contrib-tool invocation: ${local_invocation}"

 echo "${local_invocation}" > local-db-contrib-tool-invocation.txt