From bf7a751eab34934ea0545893ced49cb28e855bee Mon Sep 17 00:00:00 2001 From: Zack Winter <3457246+zackwintermdb@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:29:48 -0700 Subject: [PATCH] SERVER-92375 Remove minor version from rhel8.x variant names (#24708) GitOrigin-RevId: a726f9fe5f6e43ca862acbd8eafe364002f0ddd5 --- buildscripts/burn_in_tests.py | 2 +- buildscripts/evergreen_burn_in_tests.py | 2 +- buildscripts/evergreen_resmoke_job_count.py | 4 +- buildscripts/evergreen_task_timeout.py | 2 +- .../setup_multiversion_config.yml | 16 +- buildscripts/resmokelib/utils/__init__.py | 2 +- buildscripts/tests/test_burn_in_tags.py | 40 ++--- .../tests/test_burn_in_tags_evergreen.yml | 30 ++-- .../tests/test_evergreen_burn_in_tests.py | 2 +- buildscripts/tests/test_selected_tests.py | 6 +- etc/evergreen.yml | 148 +++++++++--------- etc/generate_subtasks_config.yml | 10 +- evergreen/resmoke_tests_execute.sh | 2 +- rpm/mongodb-enterprise-init.spec | 2 +- rpm/mongodb-enterprise-unstable-init.spec | 2 +- rpm/mongodb-enterprise-unstable.spec | 2 +- rpm/mongodb-enterprise.spec | 2 +- rpm/mongodb-org-init.spec | 2 +- rpm/mongodb-org-unstable-init.spec | 2 +- rpm/mongodb-org-unstable.spec | 2 +- rpm/mongodb-org.spec | 2 +- 21 files changed, 141 insertions(+), 141 deletions(-) diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index f69bb797672..1f1971f7e2d 100755 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -38,7 +38,7 @@ EXTERNAL_LOGGERS = { "urllib3", } -DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-required" +DEFAULT_VARIANT = "enterprise-rhel-8-64-bit-dynamic-required" ENTERPRISE_MODULE_PATH = "src/mongo/db/modules/enterprise" DEFAULT_REPO_LOCATIONS = ["."] REPEAT_SUITES = 2 diff --git a/buildscripts/evergreen_burn_in_tests.py b/buildscripts/evergreen_burn_in_tests.py index 97671901b41..b67c60202d2 100644 --- a/buildscripts/evergreen_burn_in_tests.py +++ b/buildscripts/evergreen_burn_in_tests.py @@ -27,7 +27,7 @@ from buildscripts.util.teststats import TestRuntime, HistoricTaskData CONFIG_FILE = ".evergreen.yml" DEFAULT_PROJECT = "mongodb-mongo-master" -DEFAULT_VARIANT = "enterprise-rhel-80-64-bit-dynamic-required" +DEFAULT_VARIANT = "enterprise-rhel-8-64-bit-dynamic-required" EVERGREEN_FILE = "etc/evergreen.yml" BURN_IN_TESTS_GEN_TASK = "burn_in_tests_gen" BURN_IN_TESTS_TASK = "burn_in_tests" diff --git a/buildscripts/evergreen_resmoke_job_count.py b/buildscripts/evergreen_resmoke_job_count.py index 74ade20fa95..be03cbcc3fe 100644 --- a/buildscripts/evergreen_resmoke_job_count.py +++ b/buildscripts/evergreen_resmoke_job_count.py @@ -30,8 +30,8 @@ SYS_PLATFORM = sys.platform # Apply factor for a task based on the build variant it is running on. VARIANT_TASK_FACTOR_OVERRIDES = { - "enterprise-rhel-80-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}], - "enterprise-rhel-80-64-bit-inmem": [{"task": "secondary_reads_passthrough", "factor": 0.3}] + "enterprise-rhel-8-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}], + "enterprise-rhel-8-64-bit-inmem": [{"task": "secondary_reads_passthrough", "factor": 0.3}] } TASKS_FACTORS = [{"task": r"replica_sets.*", "factor": 0.5}, {"task": r"sharding.*", "factor": 0.5}] diff --git a/buildscripts/evergreen_task_timeout.py b/buildscripts/evergreen_task_timeout.py index 90cf744c1ff..0e03c2e7302 100755 --- a/buildscripts/evergreen_task_timeout.py +++ b/buildscripts/evergreen_task_timeout.py @@ -36,7 +36,7 @@ SPECIFIC_TASK_OVERRIDES = { "replica_sets_jscore_passthrough": timedelta(hours=2, minutes=30), }, "ubuntu1804-debug-suggested": {"replica_sets_jscore_passthrough": timedelta(hours=3), }, - "enterprise-rhel-80-64-bit-coverage": { + "enterprise-rhel-8-64-bit-coverage": { "replica_sets_jscore_passthrough": timedelta(hours=2, minutes=30), }, "macos": { diff --git a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml index cc4a4065afa..b6833d6fa6e 100644 --- a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml +++ b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml @@ -122,24 +122,24 @@ evergreen_buildvariants: platform: rhel70 architecture: x86_64 - - name: rhel80 + - name: rhel8 edition: targeted - platform: rhel80 + platform: rhel8 architecture: x86_64 - - name: enterprise-rhel-80-64-bit + - name: enterprise-rhel-8-64-bit edition: enterprise - platform: rhel80 + platform: rhel8 architecture: x86_64 - - name: rhel-82-arm64 + - name: rhel-8-arm64 edition: targeted - platform: rhel82 + platform: rhel8 architecture: arm64 - - name: enterprise-rhel-82-arm64 + - name: enterprise-rhel-8-arm64 edition: enterprise - platform: rhel82 + platform: rhel8 architecture: arm64 - name: enterprise-rhel-71-ppc64le diff --git a/buildscripts/resmokelib/utils/__init__.py b/buildscripts/resmokelib/utils/__init__.py index 825228965c2..f989af27c54 100644 --- a/buildscripts/resmokelib/utils/__init__.py +++ b/buildscripts/resmokelib/utils/__init__.py @@ -126,7 +126,7 @@ def get_task_name_without_suffix(task_name, variant_name): """Return evergreen task name without suffix added to the generated task. Remove evergreen variant name, numerical suffix and underscores between them from evergreen task name. - Example: "noPassthrough_0_enterprise-rhel-80-64-bit-dynamic-required" -> "noPassthrough" + Example: "noPassthrough_0_enterprise-rhel-8-64-bit-dynamic-required" -> "noPassthrough" """ task_name = task_name if task_name else "" return re.sub(fr"(_[0-9]+)?(_{variant_name})?$", "", task_name) diff --git a/buildscripts/tests/test_burn_in_tags.py b/buildscripts/tests/test_burn_in_tags.py index 4aae3da2b06..7e1d4661585 100644 --- a/buildscripts/tests/test_burn_in_tags.py +++ b/buildscripts/tests/test_burn_in_tags.py @@ -35,7 +35,7 @@ def ns(relative_name): # pylint: disable-invalid-name def get_expansions_data(): return { "branch_name": "fake_branch", - "build_variant": "enterprise-rhel-80-64-bit", + "build_variant": "enterprise-rhel-8-64-bit", "check_evergreen": 2, "distro_id": "rhel80-small", "is_patch": "true", @@ -56,16 +56,16 @@ def get_evergreen_config() -> EvergreenProjectConfig: class TestCreateEvgBuildVariantMap(unittest.TestCase): def test_create_evg_buildvariant_map(self): evg_conf_mock = get_evergreen_config() - expansions_file_data = {"build_variant": "enterprise-rhel-80-64-bit"} + expansions_file_data = {"build_variant": "enterprise-rhel-8-64-bit"} buildvariant_map = under_test._create_evg_build_variant_map(expansions_file_data, evg_conf_mock) expected_buildvariant_map = { - "enterprise-rhel-80-64-bit-majority-read-concern-off": - "enterprise-rhel-80-64-bit-majority-read-concern-off-required", - "enterprise-rhel-80-64-bit-inmem": - "enterprise-rhel-80-64-bit-inmem-required" + "enterprise-rhel-8-64-bit-majority-read-concern-off": + "enterprise-rhel-8-64-bit-majority-read-concern-off-required", + "enterprise-rhel-8-64-bit-inmem": + "enterprise-rhel-8-64-bit-inmem-required" } self.assertEqual(buildvariant_map, expected_buildvariant_map) @@ -83,9 +83,9 @@ class TestCreateEvgBuildVariantMap(unittest.TestCase): class TestGenerateEvgBuildVariants(unittest.TestCase): def test_generate_evg_buildvariant_one_base_variant(self): evg_conf_mock = get_evergreen_config() - base_variant = "enterprise-rhel-80-64-bit-inmem" - generated_variant = "enterprise-rhel-80-64-bit-inmem-required" - burn_in_tags_gen_variant = "enterprise-rhel-80-64-bit" + base_variant = "enterprise-rhel-8-64-bit-inmem" + generated_variant = "enterprise-rhel-8-64-bit-inmem-required" + burn_in_tags_gen_variant = "enterprise-rhel-8-64-bit" variant = evg_conf_mock.get_variant(base_variant) build_variant = under_test._generate_evg_build_variant(variant, generated_variant, @@ -107,9 +107,9 @@ class TestGenerateEvgTasks(unittest.TestCase): create_tests_by_task_mock.return_value = {} expansions_file_data = get_expansions_data() buildvariant_map = { - "enterprise-rhel-80-64-bit-inmem": "enterprise-rhel-80-64-bit-inmem-required", - "enterprise-rhel-80-64-bit-majority-read-concern-off": - "enterprise-rhel-80-64-bit-majority-read-concern-off-required", + "enterprise-rhel-8-64-bit-inmem": "enterprise-rhel-8-64-bit-inmem-required", + "enterprise-rhel-8-64-bit-majority-read-concern-off": + "enterprise-rhel-8-64-bit-majority-read-concern-off-required", } # yapf: disable shrub_config = ShrubProject() evergreen_api = MagicMock() @@ -135,9 +135,9 @@ class TestGenerateEvgTasks(unittest.TestCase): } # yapf: disable expansions_file_data = get_expansions_data() buildvariant_map = { - "enterprise-rhel-80-64-bit-inmem": "enterprise-rhel-80-64-bit-inmem-required", - "enterprise-rhel-80-64-bit-majority-read-concern-off": - "enterprise-rhel-80-64-bit-majority-read-concern-off-required", + "enterprise-rhel-8-64-bit-inmem": "enterprise-rhel-8-64-bit-inmem-required", + "enterprise-rhel-8-64-bit-majority-read-concern-off": + "enterprise-rhel-8-64-bit-majority-read-concern-off-required", } # yapf: disable shrub_config = ShrubProject.empty() evergreen_api = MagicMock() @@ -164,7 +164,7 @@ class TestGenerateEvgTasks(unittest.TestCase): EXPANSIONS_FILE_DATA = { - "build_variant": "enterprise-rhel-80-64-bit", + "build_variant": "enterprise-rhel-8-64-bit", "revision": "badf00d000000000000000000000000000000000", "max_revisions": "1000", "branch_name": "mongodb-mongo-master", "is_patch": "false", "distro_id": "rhel62-small", "repeat_tests_min": "2", "repeat_tests_max": "1000", "repeat_tests_secs": "600", "project": @@ -172,10 +172,10 @@ EXPANSIONS_FILE_DATA = { } CREATE_EVG_BUILD_VARIANT_MAP = { - 'enterprise-rhel-80-64-bit-majority-read-concern-off': - 'enterprise-rhel-80-64-bit-majority-read-concern-off-required', - 'enterprise-rhel-80-64-bit-inmem': - 'enterprise-rhel-80-64-bit-inmem-required' + 'enterprise-rhel-8-64-bit-majority-read-concern-off': + 'enterprise-rhel-8-64-bit-majority-read-concern-off-required', + 'enterprise-rhel-8-64-bit-inmem': + 'enterprise-rhel-8-64-bit-inmem-required' } CREATE_TEST_MEMBERSHIP_MAP = { diff --git a/buildscripts/tests/test_burn_in_tags_evergreen.yml b/buildscripts/tests/test_burn_in_tags_evergreen.yml index 88ec844a823..5f1f1dc412b 100644 --- a/buildscripts/tests/test_burn_in_tags_evergreen.yml +++ b/buildscripts/tests/test_burn_in_tags_evergreen.yml @@ -60,11 +60,11 @@ tasks: resmoke_args: --suites=aggregation --storageEngine=wiredTiger buildvariants: -- name: enterprise-rhel-80-64-bit - display_name: "! Enterprise RHEL 8.0" +- name: enterprise-rhel-8-64-bit + display_name: "! Enterprise RHEL 8" expansions: - multiversion_platform: rhel80 - burn_in_tag_buildvariants: enterprise-rhel-80-64-bit-majority-read-concern-off enterprise-rhel-80-64-bit-inmem + multiversion_platform: rhel8 + burn_in_tag_buildvariants: enterprise-rhel-8-64-bit-majority-read-concern-off enterprise-rhel-8-64-bit-inmem tasks: - name: compile_all_run_unittests_TG distros: @@ -77,14 +77,14 @@ buildvariants: - name: buildvariant-without-burn-in-tag-buildvariants display_name: "Buildvariant without burn in tag buildvariants expansion" expansions: - multiversion_platform: rhel80 + multiversion_platform: rhel8 tasks: - name: burn_in_tags_gen -- name: enterprise-rhel-80-64-bit-majority-read-concern-off - display_name: "Enterprise RHEL 8.0 (majority read concern off)" +- name: enterprise-rhel-8-64-bit-majority-read-concern-off + display_name: "Enterprise RHEL 8 (majority read concern off)" run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-majority-read-concern-off-expansions + expansions: &enterprise-rhel-8-64-bit-majority-read-concern-off-expansions multiversion_edition: enterprise tasks: - name: compile_all_run_unittests_TG @@ -92,11 +92,11 @@ buildvariants: - rhel80-large - name: aggregation_multiversion_fuzzer_gen - name: aggregation -- name: enterprise-rhel-80-64-bit-inmem - display_name: Enterprise RHEL 8.0 (inMemory) +- name: enterprise-rhel-8-64-bit-inmem + display_name: Enterprise RHEL 8 (inMemory) run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-inmem-expansions + expansions: &enterprise-rhel-8-64-bit-inmem-expansions test_flags: >- --majorityReadConcern=off --excludeWithAnyTags=requires_majority_read_concern,uses_prepare_transaction,uses_multi_shard_transaction,uses_atclustertime @@ -106,22 +106,22 @@ buildvariants: --release --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars MONGO_DISTMOD=rhel80 - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise scons_cache_scope: shared tooltags: "ssl sasl gssapi" large_distro_name: rhel80-large tasks: - name: compile -- name: enterprise-rhel-80-64-bit-inmem - display_name: Enterprise RHEL 8.0 (inMemory) +- name: enterprise-rhel-8-64-bit-inmem + display_name: Enterprise RHEL 8 (inMemory) expansions: additional_targets: archive-mongocryptd archive-mongocryptd-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars large_distro_name: rhel80-large multiversion_edition: enterprise - multiversion_platform: rhel80 + multiversion_platform: rhel8 scons_cache_scope: shared test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling run_on: diff --git a/buildscripts/tests/test_evergreen_burn_in_tests.py b/buildscripts/tests/test_evergreen_burn_in_tests.py index 309b7007b1b..b1b856f49bb 100644 --- a/buildscripts/tests/test_evergreen_burn_in_tests.py +++ b/buildscripts/tests/test_evergreen_burn_in_tests.py @@ -100,7 +100,7 @@ class TestAcceptance(unittest.TestCase): # You can see the test file it is using below. This test is used in the 'auth' and # 'auth_audit' test suites. It needs to be in at least one of those for the test to pass. _config.NAMED_SUITES = None - variant = "enterprise-rhel-80-64-bit" + variant = "enterprise-rhel-8-64-bit" repos = [mock_changed_git_files(["jstests/auth/auth1.js"])] repeat_config = under_test.RepeatConfig() gen_config = under_test.GenerateConfig( diff --git a/buildscripts/tests/test_selected_tests.py b/buildscripts/tests/test_selected_tests.py index 98ed13efb97..51ac4a97330 100644 --- a/buildscripts/tests/test_selected_tests.py +++ b/buildscripts/tests/test_selected_tests.py @@ -138,7 +138,7 @@ class TestAcceptance(unittest.TestCase): # assert that generated suite files have the suite name and the variant name in the # filename, to prevent tasks on different variants from using the same suite file - self.assertIn("auth_enterprise-rhel-80-64-bit-dynamic-required_0.yml", files_to_generate) + self.assertIn("auth_enterprise-rhel-8-64-bit-dynamic-required_0.yml", files_to_generate) generated_evg_config_raw = [ gen_file.content for gen_file in generated_config.file_list @@ -150,7 +150,7 @@ class TestAcceptance(unittest.TestCase): # jstests/auth/auth1.js belongs to two suites, auth and auth_audit, rhel_80_with_generated_tasks = next( (variant for variant in build_variants_with_generated_tasks - if variant["name"] == "enterprise-rhel-80-64-bit-dynamic-required"), None) + if variant["name"] == "enterprise-rhel-8-64-bit-dynamic-required"), None) self.assertEqual(len(rhel_80_with_generated_tasks["tasks"]), 2) @unittest.skipIf(sys.platform.startswith("win"), "not supported on windows") @@ -197,7 +197,7 @@ class TestAcceptance(unittest.TestCase): build_variants_with_generated_tasks = generated_evg_config["buildvariants"] rhel_80_with_generated_tasks = next( (variant for variant in build_variants_with_generated_tasks - if variant["name"] == "enterprise-rhel-80-64-bit-dynamic-required"), None) + if variant["name"] == "enterprise-rhel-8-64-bit-dynamic-required"), None) self.assertEqual(len(rhel_80_with_generated_tasks["tasks"]), 5) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index e1c9ef47c59..cb652a6241f 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -327,12 +327,12 @@ variables: - enterprise-rhel-81-ppc64le - enterprise-rhel-72-s390x - enterprise-rhel-72-s390x-inmem - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-coverage - - enterprise-rhel-80-64-bit-inmem - - enterprise-rhel-80-64-bit-multiversion - - enterprise-rhel-80-64-bit-suggested - - enterprise-rhel-82-arm64 + - enterprise-rhel-8-64-bit + - enterprise-rhel-8-64-bit-coverage + - enterprise-rhel-8-64-bit-inmem + - enterprise-rhel-8-64-bit-multiversion + - enterprise-rhel-8-64-bit-suggested + - enterprise-rhel-8-arm64 - enterprise-rhel-83-s390x - enterprise-suse12-64 - enterprise-suse15-64 @@ -356,10 +356,10 @@ variables: - mh_variants: &mh_variants - enterprise-debian92-64 - enterprise-macos - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-dynamic-required + - enterprise-rhel-8-64-bit + - enterprise-rhel-8-64-bit-dynamic-required - enterprise-rhel-70-64-bit - - enterprise-rhel-82-arm64 + - enterprise-rhel-8-arm64 - enterprise-amazon2-arm64 - enterprise-amazon2-arm64-openssl111 - enterprise-amazon2023 @@ -396,12 +396,12 @@ variables: - enterprise-rhel-72-s390x - enterprise-rhel-83-s390x - ubi8 - - rhel80 - - rhel-82-arm64 - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-coverage - - enterprise-rhel-80-64-bit-suggested - - enterprise-rhel-82-arm64 + - rhel8 + - rhel-8-arm64 + - enterprise-rhel-8-64-bit + - enterprise-rhel-8-64-bit-coverage + - enterprise-rhel-8-64-bit-suggested + - enterprise-rhel-8-arm64 - suse12 - enterprise-suse12-64 - suse15 @@ -7288,7 +7288,7 @@ buildvariants: - rhel80-small expansions: &linux-64-required-duroff-expansions compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-http-client=off --modules= --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: targeted # Running WiredTiger with --nojournal in a replica set is no longer supported, so this variant # does not include replica set tests. Since transactions are only supported on replica sets, we @@ -8439,7 +8439,7 @@ buildvariants: run_on: - rhel80-small expansions: - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise stepback: false tasks: @@ -8980,19 +8980,19 @@ buildvariants: # Redhat buildvariants # ########################################### -- name: enterprise-rhel-80-64-bit - display_name: "Enterprise RHEL 8.0" +- name: enterprise-rhel-8-64-bit + display_name: "Enterprise RHEL 8" batchtime: *batchtime_one_week run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-expansions + expansions: &enterprise-rhel-8-64-bit-expansions additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug push_path: linux push_bucket: downloads.10gen.com push_name: linux push_arch: x86_64-enterprise-rhel80 compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: true packager_script: packager_enterprise.py @@ -9086,16 +9086,16 @@ buildvariants: - name: .publish - name: generate_buildid_to_debug_symbols_mapping -- &enterprise-rhel-80-64-bit-dynamic-required-template - name: enterprise-rhel-80-64-bit-dynamic-required - display_name: "! Shared Library Enterprise RHEL 8.0" +- &enterprise-rhel-8-64-bit-dynamic-required-template + name: enterprise-rhel-8-64-bit-dynamic-required + display_name: "! Shared Library Enterprise RHEL 8" cron: "0 4 * * *" # Every day starting at 04:00 run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions + expansions: &enterprise-rhel-8-64-bit-dynamic-required-expansions additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: false scons_cache_scope: shared @@ -9105,7 +9105,7 @@ buildvariants: target_resmoke_time: 10 max_sub_suites: 5 large_distro_name: rhel80-medium - burn_in_tag_buildvariants: enterprise-rhel-80-64-bit-inmem linux-64-duroff enterprise-rhel-80-64-bit-multiversion + burn_in_tag_buildvariants: enterprise-rhel-8-64-bit-inmem linux-64-duroff enterprise-rhel-8-64-bit-multiversion num_scons_link_jobs_available: 0.99 tasks: - name: compile_test_and_package_parallel_core_stream_TG @@ -9209,15 +9209,15 @@ buildvariants: distros: - rhel80-xlarge -- name: enterprise-rhel-80-64-bit-dynamic-latches-disabled-required - display_name: "! Shared Library Enterprise RHEL 8.0 (without Diagnostic Latches)" +- name: enterprise-rhel-8-64-bit-dynamic-latches-disabled-required + display_name: "! Shared Library Enterprise RHEL 8 (without Diagnostic Latches)" cron: "0 4 * * *" # Every day starting at 04:00 run_on: - rhel80-small expansions: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=off - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: false scons_cache_scope: shared @@ -9227,7 +9227,7 @@ buildvariants: target_resmoke_time: 10 max_sub_suites: 5 large_distro_name: rhel80-medium - burn_in_tag_buildvariants: enterprise-rhel-80-64-bit-inmem linux-64-duroff enterprise-rhel-80-64-bit-multiversion + burn_in_tag_buildvariants: enterprise-rhel-8-64-bit-inmem linux-64-duroff enterprise-rhel-8-64-bit-multiversion num_scons_link_jobs_available: 0.99 test_flags: --excludeWithAnyTags=requires_latch_analyzer tasks: @@ -9331,14 +9331,14 @@ buildvariants: distros: - rhel80-xlarge -- &enterprise-rhel-80-64-bit-dynamic-backport-feature-flags-required-template - name: enterprise-rhel-80-64-bit-dynamic-backport-feature-flags-required - display_name: "! Shared Library Enterprise RHEL 8.0 (Backport Feature Flags)" +- &enterprise-rhel-8-64-bit-dynamic-backport-feature-flags-required-template + name: enterprise-rhel-8-64-bit-dynamic-backport-feature-flags-required + display_name: "! Shared Library Enterprise RHEL 8 (Backport Feature Flags)" cron: "0 4 * * *" # Every day starting at 04:00 run_on: - rhel80-small expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-required-expansions + <<: *enterprise-rhel-8-64-bit-dynamic-required-expansions test_flags: >- --additionalFeatureFlags=featureFlagTimeseriesUpdatesAndDeletes --additionalFeatureFlags=featureFlagShardedTimeSeries @@ -9415,8 +9415,8 @@ buildvariants: - name: .updatefuzzer - name: secondary_reads_passthrough_gen -- name: enterprise-rhel-80-64-bit-large-txns-format - display_name: "Enterprise RHEL 8.0 (large transactions format)" +- name: enterprise-rhel-8-64-bit-large-txns-format + display_name: "Enterprise RHEL 8 (large transactions format)" run_on: - rhel80-small batchtime: *batchtime_one_week @@ -9428,7 +9428,7 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise scons_cache_scope: shared @@ -9488,11 +9488,11 @@ buildvariants: # This build variant is used to run multiversion tests as part of burn_in_tags as these tests are # currently only run on our daily builders. -- name: enterprise-rhel-80-64-bit-multiversion - display_name: "Enterprise RHEL 8.0 (implicit multiversion)" +- name: enterprise-rhel-8-64-bit-multiversion + display_name: "Enterprise RHEL 8 (implicit multiversion)" run_on: - rhel80-small - expansions: &enterprise-rhel-80-64-bit-multiversion + expansions: &enterprise-rhel-8-64-bit-multiversion test_flags: >- --excludeWithAnyTags=requires_fcv_47,requires_fcv_48,requires_fcv_49,requires_fcv_50,multiversion_incompatible compile_flags: >- @@ -9501,7 +9501,7 @@ buildvariants: --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars MONGO_DISTMOD=rhel80 --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise scons_cache_scope: shared @@ -9518,12 +9518,12 @@ buildvariants: - name: .multiversion_passthrough - name: .random_multiversion_ds -- name: enterprise-rhel-80-64-bit-lock-free-reads - display_name: "Enterprise RHEL 8.0 (Lock Free Reads disabled)" +- name: enterprise-rhel-8-64-bit-lock-free-reads + display_name: "Enterprise RHEL 8 (Lock Free Reads disabled)" run_on: - rhel80-small batchtime: *batchtime_one_week - expansions: &enterprise-rhel-80-64-bit-lock-free-reads-expansions + expansions: &enterprise-rhel-8-64-bit-lock-free-reads-expansions test_flags: >- --mongodSetParameters="{featureFlagLockFreeReads: false}" --excludeWithAnyTags=incompatible_with_lockfreereads compile_flags: >- @@ -9532,7 +9532,7 @@ buildvariants: --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars MONGO_DISTMOD=rhel80 --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise repo_edition: enterprise scons_cache_scope: shared @@ -9609,8 +9609,8 @@ buildvariants: distros: - rhel80-large -- name: rhel-80-64-bit-nossl - display_name: "RHEL 8.0 Shared Library (No SSL)" +- name: rhel-8-64-bit-nossl + display_name: "RHEL 8 Shared Library (No SSL)" run_on: - rhel80-small batchtime: *batchtime_one_week @@ -9624,7 +9624,7 @@ buildvariants: --modules= --use-diagnostic-latches=on test_flags: --enableEnterpriseTests=off - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise scons_cache_scope: shared build_mongoreplay: false @@ -9636,8 +9636,8 @@ buildvariants: - name: jsCore -- name: enterprise-rhel-80-64-bit-coverage - display_name: "~ Enterprise RHEL 8.0 DEBUG Code Coverage" +- name: enterprise-rhel-8-64-bit-coverage + display_name: "~ Enterprise RHEL 8 DEBUG Code Coverage" run_on: - rhel80-medium batchtime: *batchtime_one_week @@ -9646,7 +9646,7 @@ buildvariants: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug test_flags: --excludeWithAnyTags=resource_intensive,requires_increased_memlock_limits compile_flags: --dbg=on --gcov --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's # The gcov instrumentation saves the path the .gcno files were created in as the default path @@ -9702,13 +9702,13 @@ buildvariants: # The following build variant is meant to provide a baseline to measure how much overhead we # are spending when we split tasks into multiple sub-tasks. -- name: enterprise-rhel-80-64-bit-single-task-baseline - display_name: "Enterprise RHEL 8.0 (Single Task Baseline)" +- name: enterprise-rhel-8-64-bit-single-task-baseline + display_name: "Enterprise RHEL 8 (Single Task Baseline)" batchtime: *batchtime_one_week run_on: - rhel80-small expansions: - <<: *enterprise-rhel-80-64-bit-expansions + <<: *enterprise-rhel-8-64-bit-expansions max_sub_suites: 1 # Only generate 1 sub-suite per task. tasks: - name: compile_test_and_package_serial_TG @@ -9828,9 +9828,9 @@ buildvariants: - name: sharding_gen - name: replica_sets_gen -- &enterprise-rhel-80-64-bit-suggested-template - name: enterprise-rhel-80-64-bit-suggested - display_name: "* Enterprise RHEL 8.0" +- &enterprise-rhel-8-64-bit-suggested-template + name: enterprise-rhel-8-64-bit-suggested + display_name: "* Enterprise RHEL 8" batchtime: *batchtime_one_week run_on: - rhel80-build @@ -9841,7 +9841,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-rhel80 compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: true packager_script: packager_enterprise.py @@ -9881,8 +9881,8 @@ buildvariants: - name: snmp - name: generate_buildid_to_debug_symbols_mapping -- name: enterprise-rhel-82-arm64 - display_name: "Enterprise RHEL 8.2 arm64" +- name: enterprise-rhel-8-arm64 + display_name: "Enterprise RHEL 8 arm64" run_on: - rhel82-arm64-small expansions: @@ -10106,8 +10106,8 @@ buildvariants: - name: .publish - name: generate_buildid_to_debug_symbols_mapping -- name: rhel80 - display_name: RHEL 8.0 +- name: rhel8 + display_name: RHEL 8 run_on: - rhel80-build expansions: @@ -10117,7 +10117,7 @@ buildvariants: push_arch: x86_64-rhel80 compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules= test_flags: --enableEnterpriseTests=off --excludeWithAnyTags=requires_latch_analyzer - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: targeted has_packages: true packager_script: packager.py @@ -10153,8 +10153,8 @@ buildvariants: - name: .publish - name: generate_buildid_to_debug_symbols_mapping -- name: rhel-82-arm64 - display_name: RHEL 8.2 arm64 +- name: rhel-8-arm64 + display_name: RHEL 8 arm64 run_on: - rhel82-arm64-small expansions: @@ -10943,8 +10943,8 @@ buildvariants: # storage engine buildvariants # ################################ -- name: enterprise-rhel-80-benchmarks - display_name: Enterprise RHEL 8.0 (Benchmarks) +- name: enterprise-rhel-8-benchmarks + display_name: Enterprise RHEL 8 (Benchmarks) run_on: - rhel80-medium expansions: @@ -10953,15 +10953,15 @@ buildvariants: - name: compile_benchmarks - name: .benchmarks -- name: enterprise-rhel-80-64-bit-inmem - display_name: Enterprise RHEL 8.0 (inMemory) +- name: enterprise-rhel-8-64-bit-inmem + display_name: Enterprise RHEL 8 (inMemory) run_on: - rhel80-small expansions: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise scons_cache_scope: shared large_distro_name: rhel80-large @@ -11030,7 +11030,7 @@ buildvariants: --mongodSetParameters="{oplogApplicationEnforcesSteadyStateConstraints: false}" --enableEnterpriseTests=off compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --modules= --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: targeted scons_cache_scope: shared tasks: @@ -11561,14 +11561,14 @@ buildvariants: - name: check_for_todos - name: live-record - display_name: "~ RHEL 8.0 Shared Library (with UndoDB live-record)" + display_name: "~ RHEL 8 Shared Library (with UndoDB live-record)" batchtime: *batchtime_one_week stepback: false run_on: - rhel80-medium expansions: compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on - multiversion_platform: rhel80 + multiversion_platform: rhel8 multiversion_edition: enterprise has_packages: false scons_cache_scope: shared diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml index f948bd4d7d5..bf41c0224a7 100644 --- a/etc/generate_subtasks_config.yml +++ b/etc/generate_subtasks_config.yml @@ -24,10 +24,10 @@ build_variant_large_distro_exceptions: - enterprise-rhel-71-ppc64le-inmem - enterprise-rhel-72-s390x - enterprise-rhel-72-s390x-inmem - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-coverage + - enterprise-rhel-8-64-bit + - enterprise-rhel-8-64-bit-coverage - enterprise-rhel-81-ppc64le - - enterprise-rhel-82-arm64 + - enterprise-rhel-8-arm64 - enterprise-rhel-83-s390x - enterprise-suse12-64 - enterprise-suse12-s390x @@ -41,8 +41,8 @@ build_variant_large_distro_exceptions: - linux-64-ephemeralForTest - macos - rhel70 - - rhel80 - - rhel-82-arm64 + - rhel8 + - rhel-8-arm64 - suse12 - suse15 - ubi8 diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index 363dd3d1474..1c36bdd0de6 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -88,7 +88,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then set -o errexit # Reduce the JSHeapLimit for the serial_run task task on Code Coverage builder variant. - if [[ "${build_variant}" = "enterprise-rhel-80-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then + if [[ "${build_variant}" = "enterprise-rhel-8-64-bit-coverage" && "${task_name}" = "serial_run" ]]; then extra_args="$extra_args --mongodSetParameter \"{'jsHeapLimitMB':10}\"" fi diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec index cc2440066e5..402f4a524ef 100644 --- a/rpm/mongodb-enterprise-init.spec +++ b/rpm/mongodb-enterprise-init.spec @@ -267,7 +267,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec index 2bcc0149b0d..f79f0a93e3f 100644 --- a/rpm/mongodb-enterprise-unstable-init.spec +++ b/rpm/mongodb-enterprise-unstable-init.spec @@ -256,7 +256,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec index 8d03372f7a0..84c97e82105 100644 --- a/rpm/mongodb-enterprise-unstable.spec +++ b/rpm/mongodb-enterprise-unstable.spec @@ -263,7 +263,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec index e48fecf07b4..843d6d414b5 100644 --- a/rpm/mongodb-enterprise.spec +++ b/rpm/mongodb-enterprise.spec @@ -274,7 +274,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec index 0500d557393..61368f49e7d 100644 --- a/rpm/mongodb-org-init.spec +++ b/rpm/mongodb-org-init.spec @@ -244,7 +244,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec index d65a42fe134..dc968af3b79 100644 --- a/rpm/mongodb-org-unstable-init.spec +++ b/rpm/mongodb-org-unstable-init.spec @@ -231,7 +231,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec index 63df7eb7ce0..683f5f11eae 100644 --- a/rpm/mongodb-org-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -238,7 +238,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec index 21c1c41871c..b26200f61e0 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -250,7 +250,7 @@ MongoDB features: This package provides the MongoDB static library and header files needed to develop MongoDB client software. -#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0 +#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8 %global debug_package %{nil} %prep