mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-108976 Remove multiversion_platform_50_or_later (#39814) 

GitOrigin-RevId: b1b9c282b8e18a623039c82552e996f602ccca71
This commit is contained in:
Zack Winter 2025-08-11 16:11:06 -07:00 committed by MongoDB Bot
parent 0c80b328f2
commit ff7e3b7dc5
9 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml
View File

@ -12,8 +12,7 @@ buildvariants:
run_on: run_on:
- rhel8.8-small - rhel8.8-small
expansions: expansions:
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
compile_variant: *stm-daily-cron compile_variant: *stm-daily-cron
stepback: false stepback: false

3
etc/evergreen_yml_components/variants/rhel/test_dev.yml
View File

@ -59,8 +59,7 @@ variables:
# - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
- &linux_x86_generic_expansions - &linux_x86_generic_expansions
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
repo_edition: enterprise repo_edition: enterprise
large_distro_name: rhel8.8-medium large_distro_name: rhel8.8-medium

6
etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml
View File

@ -39,8 +39,7 @@ variables:
# - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
- &linux_x86_generic_expansions - &linux_x86_generic_expansions
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
repo_edition: enterprise repo_edition: enterprise
large_distro_name: rhel8.8-medium large_distro_name: rhel8.8-medium
@ -63,8 +62,7 @@ buildvariants:
--excludeWithAnyTags=requires_persistence,requires_journaling --excludeWithAnyTags=requires_persistence,requires_journaling
bazel_compile_flags: >- bazel_compile_flags: >-
--define=MONGO_DISTMOD=rhel88 --define=MONGO_DISTMOD=rhel88
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
large_distro_name: rhel8.8-large large_distro_name: rhel8.8-large
core_analyzer_distro_name: rhel8.8-xlarge core_analyzer_distro_name: rhel8.8-xlarge

9
etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml
View File

@ -82,8 +82,7 @@ variables:
# - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
- &linux_x86_generic_expansions - &linux_x86_generic_expansions
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
repo_edition: enterprise repo_edition: enterprise
large_distro_name: rhel8.8-medium large_distro_name: rhel8.8-medium
@ -126,8 +125,7 @@ variables:
bazel_compile_flags: >- bazel_compile_flags: >-
--define=MONGO_DISTMOD=rhel88 --define=MONGO_DISTMOD=rhel88
test_flags: --excludeWithAnyTags=requires_ldap_pool test_flags: --excludeWithAnyTags=requires_ldap_pool
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
has_packages: true has_packages: true
packager_script: packager_enterprise.py packager_script: packager_enterprise.py
@ -564,8 +562,7 @@ buildvariants:
bazel_compile_flags: >- bazel_compile_flags: >-
--define=MONGO_DISTMOD=rhel88 --define=MONGO_DISTMOD=rhel88
--linkstatic=False --linkstatic=False
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
test_flags: >- test_flags: >-
--mongosSetParameters="joinIngressSessionsOnShutdown: \"true\"" --mongosSetParameters="joinIngressSessionsOnShutdown: \"true\""

6
etc/evergreen_yml_components/variants/rhel/test_release.yml
View File

@ -52,8 +52,7 @@ buildvariants:
test_flags: >- test_flags: >-
--excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits --excludeWithAnyTags=requires_external_data_source,requires_increased_memlock_limits
--enableEnterpriseTests=off --enableEnterpriseTests=off
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: targeted multiversion_edition: targeted
has_packages: true has_packages: true
packager_script: packager.py packager_script: packager.py
@ -103,8 +102,7 @@ buildvariants:
compile_all_but_not_unittests_flags: >- compile_all_but_not_unittests_flags: >-
--linkopt=-s --linkopt=-s
test_flags: --excludeWithAnyTags=requires_external_data_source test_flags: --excludeWithAnyTags=requires_external_data_source
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
has_packages: true has_packages: true
packager_script: packager_enterprise.py packager_script: packager_enterprise.py

15
etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
View File

@ -46,8 +46,7 @@ variables:
# - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
- &linux_x86_generic_expansions - &linux_x86_generic_expansions
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
repo_edition: enterprise repo_edition: enterprise
large_distro_name: rhel8.8-medium large_distro_name: rhel8.8-medium
@ -148,8 +147,7 @@ variables:
max_sub_suites: 3 max_sub_suites: 3
large_distro_name: rhel8.8-xlarge large_distro_name: rhel8.8-xlarge
xlarge_distro_name: rhel8.8-xxlarge xlarge_distro_name: rhel8.8-xxlarge
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
# THIS HAS COPIES IN # THIS HAS COPIES IN
@ -203,8 +201,7 @@ variables:
large_distro_name: &enterprise-rhel8-debug-tsan-large-distro-name rhel8.8-xlarge large_distro_name: &enterprise-rhel8-debug-tsan-large-distro-name rhel8.8-xlarge
xlarge_distro_name: rhel8.8-xxlarge xlarge_distro_name: rhel8.8-xxlarge
core_analyzer_distro_name: rhel8.8-xxlarge core_analyzer_distro_name: rhel8.8-xxlarge
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
buildvariants: buildvariants:
@ -417,8 +414,7 @@ buildvariants:
--linkstatic=False --linkstatic=False
--build_enterprise=False --build_enterprise=False
--separate_debug=False --separate_debug=False
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build. resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under ASAN build.
hang_analyzer_dump_core: false hang_analyzer_dump_core: false
@ -731,8 +727,7 @@ buildvariants:
--excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible
--disableUnreleasedIFRFlags --disableUnreleasedIFRFlags
--mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}"
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
large_distro_name: rhel8.8-large large_distro_name: rhel8.8-large

15
etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml
View File

@ -49,8 +49,7 @@ variables:
# - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev.yml
# ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES
- &linux_x86_generic_expansions - &linux_x86_generic_expansions
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
repo_edition: enterprise repo_edition: enterprise
large_distro_name: rhel8.8-medium large_distro_name: rhel8.8-medium
@ -110,8 +109,7 @@ variables:
max_sub_suites: 3 max_sub_suites: 3
large_distro_name: rhel8.8-xlarge large_distro_name: rhel8.8-xlarge
xlarge_distro_name: rhel8.8-xxlarge xlarge_distro_name: rhel8.8-xxlarge
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
# THIS HAS COPIES IN # THIS HAS COPIES IN
@ -165,8 +163,7 @@ variables:
large_distro_name: &enterprise-rhel8-debug-tsan-large-distro-name rhel8.8-xlarge large_distro_name: &enterprise-rhel8-debug-tsan-large-distro-name rhel8.8-xlarge
xlarge_distro_name: rhel8.8-xxlarge xlarge_distro_name: rhel8.8-xxlarge
core_analyzer_distro_name: rhel8.8-xxlarge core_analyzer_distro_name: rhel8.8-xxlarge
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
buildvariants: buildvariants:
@ -417,8 +414,7 @@ buildvariants:
--excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible
--runAllFeatureFlagTests --runAllFeatureFlagTests
--mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}"
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
large_distro_name: rhel8.8-large large_distro_name: rhel8.8-large
@ -444,8 +440,7 @@ buildvariants:
--excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible --excludeWithAnyTags=requires_increased_memlock_limits,all_feature_flags_incompatible
--runAllFeatureFlagTests --disableUnreleasedIFRFlags --runAllFeatureFlagTests --disableUnreleasedIFRFlags
--mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}"
multiversion_platform: rhel80 multiversion_platform: rhel8
multiversion_platform_50_or_later: rhel8
multiversion_edition: enterprise multiversion_edition: enterprise
resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build.
large_distro_name: rhel8.8-large large_distro_name: rhel8.8-large

4
evergreen/compiled_binaries_get.sh
View File

@ -19,10 +19,6 @@ architecture="${multiversion_architecture}"
version=${project#mongodb-mongo-} version=${project#mongodb-mongo-}
version=${version#v} 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 # This is primarily for tests for infrastructure which don't always need the latest
# binaries. # binaries.
db-contrib-tool setup-repro-env \ db-contrib-tool setup-repro-env \

4
evergreen/multiversion_selection.sh
View File

@ -33,10 +33,6 @@ if [[ -n "${multiversion_last_continuous_variant}" ]]; then
last_continuous_arg="" last_continuous_arg=""
fi fi
if [ ! -z "${multiversion_platform_50_or_later}" ]; then
platform="${multiversion_platform_50_or_later}"
fi
base_command="db-contrib-tool setup-repro-env" base_command="db-contrib-tool setup-repro-env"
evergreen_args="-sb \ evergreen_args="-sb \
--platform $platform \ --platform $platform \