diff --git a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml index fa3fd9d2670..b2ab489cd5e 100644 --- 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,8 +12,7 @@ buildvariants: run_on: - rhel8.8-small expansions: - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise compile_variant: *stm-daily-cron stepback: false diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev.yml b/etc/evergreen_yml_components/variants/rhel/test_dev.yml index b2fde511ef1..fa333c788f8 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml @@ -59,8 +59,7 @@ 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise large_distro_name: rhel8.8-medium diff --git 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 index e74b866862d..75c06e7a841 100644 --- 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 @@ -39,8 +39,7 @@ 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise large_distro_name: rhel8.8-medium @@ -63,8 +62,7 @@ buildvariants: --excludeWithAnyTags=requires_persistence,requires_journaling bazel_compile_flags: >- --define=MONGO_DISTMOD=rhel88 - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise large_distro_name: rhel8.8-large core_analyzer_distro_name: rhel8.8-xlarge diff --git 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 index 2f4a461419c..6e7d72138e0 100644 --- 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 @@ -82,8 +82,7 @@ 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise large_distro_name: rhel8.8-medium @@ -126,8 +125,7 @@ variables: bazel_compile_flags: >- --define=MONGO_DISTMOD=rhel88 test_flags: --excludeWithAnyTags=requires_ldap_pool - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: true packager_script: packager_enterprise.py @@ -564,8 +562,7 @@ buildvariants: bazel_compile_flags: >- --define=MONGO_DISTMOD=rhel88 --linkstatic=False - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise test_flags: >- --mongosSetParameters="joinIngressSessionsOnShutdown: \"true\"" diff --git a/etc/evergreen_yml_components/variants/rhel/test_release.yml b/etc/evergreen_yml_components/variants/rhel/test_release.yml index 00eb31b39dd..28a5f397738 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_release.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml @@ -52,8 +52,7 @@ buildvariants: test_flags: >- --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits --enableEnterpriseTests=off - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: targeted has_packages: true packager_script: packager.py @@ -103,8 +102,7 @@ buildvariants: compile_all_but_not_unittests_flags: >- --linkopt=-s test_flags: --excludeWithAnyTags=requires_external_data_source - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: true packager_script: packager_enterprise.py diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml index 0420394f0c8..18806c95cbc 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml @@ -46,8 +46,7 @@ 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise large_distro_name: rhel8.8-medium @@ -148,8 +147,7 @@ variables: max_sub_suites: 3 large_distro_name: rhel8.8-xlarge xlarge_distro_name: rhel8.8-xxlarge - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise # THIS HAS COPIES IN @@ -203,8 +201,7 @@ variables: 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise buildvariants: @@ -417,8 +414,7 @@ buildvariants: --linkstatic=False --build_enterprise=False --separate_debug=False - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build. hang_analyzer_dump_core: false @@ -731,8 +727,7 @@ buildvariants: --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --disableUnreleasedIFRFlags --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. large_distro_name: rhel8.8-large diff --git 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 index 6aeb4849793..d0efbe763d0 100644 --- 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 @@ -49,8 +49,7 @@ 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise large_distro_name: rhel8.8-medium @@ -110,8 +109,7 @@ variables: max_sub_suites: 3 large_distro_name: rhel8.8-xlarge xlarge_distro_name: rhel8.8-xxlarge - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise # THIS HAS COPIES IN @@ -165,8 +163,7 @@ variables: 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: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise buildvariants: @@ -417,8 +414,7 @@ buildvariants: --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --runAllFeatureFlagTests --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. large_distro_name: rhel8.8-large @@ -444,8 +440,7 @@ buildvariants: --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --runAllFeatureFlagTests --disableUnreleasedIFRFlags --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" - multiversion_platform: rhel80 - multiversion_platform_50_or_later: rhel8 + multiversion_platform: rhel8 multiversion_edition: enterprise resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. large_distro_name: rhel8.8-large diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh index 543dd62177d..c9e3c41bc48 100755 --- a/evergreen/compiled_binaries_get.sh +++ b/evergreen/compiled_binaries_get.sh @@ -19,10 +19,6 @@ 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 \ diff --git a/evergreen/multiversion_selection.sh b/evergreen/multiversion_selection.sh index 4941d3e8983..93566f6321b 100644 --- a/evergreen/multiversion_selection.sh +++ b/evergreen/multiversion_selection.sh @@ -33,10 +33,6 @@ if [[ -n "${multiversion_last_continuous_variant}" ]]; then last_continuous_arg="" fi -if [ ! -z "${multiversion_platform_50_or_later}" ]; then - platform="${multiversion_platform_50_or_later}" -fi - base_command="db-contrib-tool setup-repro-env" evergreen_args="-sb \ --platform $platform \