diff --git a/buildscripts/evergreen_gen_build_metrics_tasks.py b/buildscripts/evergreen_gen_build_metrics_tasks.py index 5d2f1bdf427..7820f517765 100755 --- a/buildscripts/evergreen_gen_build_metrics_tasks.py +++ b/buildscripts/evergreen_gen_build_metrics_tasks.py @@ -192,16 +192,16 @@ def main(): else: if platform.machine() == "x86_64": variant = BuildVariant( - name="enterprise-rhel-80-64-bit-build-metrics", + name="enterprise-rhel-88-64-bit-build-metrics", activate=True, ) for link_model, tasks in tasks["linux_x86_64_tasks"].items(): variant.add_task_group( - create_task_group(f"linux_X86_64_{link_model}", tasks), ["rhel80-xlarge"] + create_task_group(f"linux_X86_64_{link_model}", tasks), ["rhel8.8-xlarge"] ) else: variant = BuildVariant( - name="enterprise-rhel-80-aarch64-build-metrics", + name="enterprise-rhel-88-aarch64-build-metrics", activate=True, ) for link_model, tasks in tasks["linux_arm64_tasks"].items(): diff --git a/buildscripts/evergreen_resmoke_job_count.py b/buildscripts/evergreen_resmoke_job_count.py index 0abd76f01e9..e365b7752fc 100644 --- a/buildscripts/evergreen_resmoke_job_count.py +++ b/buildscripts/evergreen_resmoke_job_count.py @@ -30,18 +30,18 @@ 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": [ + "enterprise-rhel-88-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}], + "enterprise-rhel-88-64-bit-inmem": [ {"task": "secondary_reads_passthrough", "factor": 0.3}, {"task": "multi_stmt_txn_jscore_passthrough_with_migration", "factor": 0.3}, ], - "enterprise-rhel80-debug-tsan": [ + "enterprise-rhel88-debug-tsan": [ {"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.125} ], - "rhel80-debug-aubsan-classic-engine": [ + "rhel88-debug-aubsan-classic-engine": [ {"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.25} ], - "rhel80-debug-aubsan-all-feature-flags": [ + "rhel88-debug-aubsan-all-feature-flags": [ {"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.25} ], # TODO(SERVER-91466): figure out why noPassthrough tests are taking up more memory after switching @@ -54,7 +54,7 @@ VARIANT_TASK_FACTOR_OVERRIDES = { TASKS_FACTORS = [{"task": r"replica_sets.*", "factor": 0.5}, {"task": r"sharding.*", "factor": 0.5}] -DISTRO_MULTIPLIERS = {"rhel80-large": 1.618} +DISTRO_MULTIPLIERS = {"rhel8.8-large": 1.618} # Apply factor for a task based on the machine type it is running on. MACHINE_TASK_FACTOR_OVERRIDES = { diff --git a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml index 55ffe1169bc..77a4e294000 100644 --- a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml +++ b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml @@ -115,11 +115,21 @@ evergreen_buildvariants: platform: rhel80 architecture: x86_64 + - name: rhel88 + edition: targeted + platform: rhel88 + architecture: x86_64 + - name: enterprise-rhel-80-64-bit edition: enterprise platform: rhel80 architecture: x86_64 + - name: enterprise-rhel-88-64-bit + edition: enterprise + platform: rhel88 + architecture: x86_64 + - name: rhel-82-arm64 edition: targeted platform: rhel82 @@ -130,6 +140,16 @@ evergreen_buildvariants: platform: rhel82 architecture: arm64 + - name: rhel-88-arm64 + edition: targeted + platform: rhel88 + architecture: arm64 + + - name: enterprise-rhel-88-arm64 + edition: enterprise + platform: rhel88 + architecture: arm64 + - name: enterprise-rhel-71-ppc64le edition: enterprise platform: rhel71 diff --git a/buildscripts/resmokelib/utils/__init__.py b/buildscripts/resmokelib/utils/__init__.py index 37441656b56..428f74cfeeb 100644 --- a/buildscripts/resmokelib/utils/__init__.py +++ b/buildscripts/resmokelib/utils/__init__.py @@ -87,7 +87,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-88-64-bit-dynamic-required" -> "noPassthrough" """ task_name = task_name if task_name else "" return re.sub(rf"(_[0-9]+)?(_{variant_name})?$", "", task_name) diff --git a/buildscripts/testmatrix/getdisplaytaskname.py b/buildscripts/testmatrix/getdisplaytaskname.py index c0a08b422bc..d5c400b6300 100644 --- a/buildscripts/testmatrix/getdisplaytaskname.py +++ b/buildscripts/testmatrix/getdisplaytaskname.py @@ -1,7 +1,7 @@ """ Get the display task name from the execution task and the variant. -Get an execution task name like this: multiversion_auth_0_enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required +Get an execution task name like this: multiversion_auth_0_enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required Into a display task name like this: multiversion_auth """ diff --git a/buildscripts/tests/util/test_taskname.py b/buildscripts/tests/util/test_taskname.py index bb22315948f..ce831cae285 100644 --- a/buildscripts/tests/util/test_taskname.py +++ b/buildscripts/tests/util/test_taskname.py @@ -30,7 +30,7 @@ class TestRemoveGenSuffix(unittest.TestCase): class TestDetermineTaskBaseName(unittest.TestCase): def test_task_name_with_build_variant_should_strip_bv_and_sub_task_index(self): - bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required" + bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required" task_name = f"auth_23_{bv}" base_task_name = under_test.determine_task_base_name(task_name, bv) @@ -38,7 +38,7 @@ class TestDetermineTaskBaseName(unittest.TestCase): self.assertEqual("auth", base_task_name) def test_task_name_without_build_variant_should_strip_sub_task_index(self): - bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required" + bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required" task_name = "auth_314" base_task_name = under_test.determine_task_base_name(task_name, bv) @@ -46,7 +46,7 @@ class TestDetermineTaskBaseName(unittest.TestCase): self.assertEqual("auth", base_task_name) def test_task_name_without_build_variant_or_subtask_index_should_self(self): - bv = "enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required" + bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required" task_name = "auth" base_task_name = under_test.determine_task_base_name(task_name, bv) diff --git a/buildscripts/toolchains.py b/buildscripts/toolchains.py index ec83e612fbc..826ffdefe90 100755 --- a/buildscripts/toolchains.py +++ b/buildscripts/toolchains.py @@ -71,7 +71,7 @@ class ToolchainDistroName(Tuple[str, ...], enum.Enum): MACOS1100 = ("macos-1100",) RHEL6 = ("rhel6", "rhel62", "rhel67") RHEL7 = ("rhel7", "rhel70", "rhel71", "rhel72", "rhel76", "ubi7") - RHEL8 = ("rhel8", "rhel80", "rhel81", "rhel82", "rhel83", "rhel84", "ubi8") + RHEL8 = ("rhel8", "rhel80", "rhel81", "rhel82", "rhel83", "rhel84", "rhel88", "ubi8") SUSE12 = ("suse12", "suse12-sp5") SUSE15 = ("suse15", "suse15-sp0", "suse15-sp2") UBUNTU1404 = ("ubuntu1404",) diff --git a/docs/branching/README.md b/docs/branching/README.md index 293e040aa3f..aca117336b3 100644 --- a/docs/branching/README.md +++ b/docs/branching/README.md @@ -59,7 +59,7 @@ The reason they should be pushed as separate commits is in the case of needing t - Build variant names: - `enterprise-windows-all-feature-flags-required` - - `rhel80-debug-aubsan-lite-all-feature-flags-required` + - `rhel88-debug-aubsan-lite-all-feature-flags-required` - Actions: diff --git a/docs/evergreen-testing/burn_in_tags.md b/docs/evergreen-testing/burn_in_tags.md index 2eadec1d6f2..b4e645308a9 100644 --- a/docs/evergreen-testing/burn_in_tags.md +++ b/docs/evergreen-testing/burn_in_tags.md @@ -11,7 +11,7 @@ variants, `burn_in_tags` runs them on the burn_in build variants that are genera ## How to use it You can use `burn_in_tags` on evergreen by selecting the `burn_in_tags_gen` task when creating a patch. -The burn_in build variants, i.e., `enterprise-rhel-80-64-bit-inmem` and `enterprise-rhel-80-64-bit-multiversion` +The burn_in build variants, i.e., `enterprise-rhel-88-64-bit-inmem` and `enterprise-rhel-88-64-bit-multiversion` will be generated, each of which will have a `burn_in_tests` task generated by the [mongo-task-generator](https://github.com/mongodb/mongo-task-generator). `burn_in_tests` task, a [generated task](task_generation.md), may have multiple sub-tasks which run the test suites only for the diff --git a/etc/evergreen_timeouts.yml b/etc/evergreen_timeouts.yml index f1ace91d096..70813cb268c 100644 --- a/etc/evergreen_timeouts.yml +++ b/etc/evergreen_timeouts.yml @@ -34,7 +34,7 @@ overrides: - task: replica_sets_jscore_passthrough exec_timeout: 150 # 2.5 hours - enterprise-rhel-80-64-bit-dynamic-all-feature-flags: + enterprise-rhel-88-64-bit-dynamic-all-feature-flags: - task: cursor_hints_to_query_settings_replset_passthrough exec_timeout: 240 # 4 hours - task: cursor_hints_to_query_settings_sharded_collections_passthrough @@ -42,7 +42,7 @@ overrides: - task: cursor_hints_to_query_settings_unsharded_collections_passthrough exec_timeout: 240 # 4 hours - enterprise-rhel80-debug-tsan: + enterprise-rhel88-debug-tsan: - task: aggregation_expression_multiversion_fuzzer exec_timeout: 600 # 10 hours - task: aggregation_multiversion_fuzzer @@ -114,7 +114,7 @@ overrides: - task: replica_sets_jscore_passthrough exec_timeout: 150 # 2.5 hours - rhel80-asan: + rhel88-asan: - task: aggregation_timeseries_fuzzer exec_timeout: 360 # 6 hours - task: aggregation_blockprocessing_fuzzer @@ -126,11 +126,11 @@ overrides: - task: aggregation_multiversion_fuzzer_last_lts exec_timeout: 300 # 5 hours - rhel80-debug-ubsan-classic-engine: + rhel88-debug-ubsan-classic-engine: - task: update_timeseries_fuzzer exec_timeout: 150 # 2.5 hours - rhel80-debug-aubsan-all-feature-flags: + rhel88-debug-aubsan-all-feature-flags: - task: update_timeseries_fuzzer exec_timeout: 180 # 3 hours - task: change_stream_serverless_no_optimization_fuzzer @@ -140,7 +140,7 @@ overrides: - task: change_stream_optimization_fuzzer exec_timeout: 300 # 5 hours - rhel80-debug-aubsan: + rhel88-debug-aubsan: - task: change_stream_serverless_no_optimization_fuzzer exec_timeout: 300 # 5 hours - task: change_stream_serverless_fuzzer @@ -148,7 +148,7 @@ overrides: - task: change_stream_optimization_fuzzer exec_timeout: 300 # 5 hours - rhel80-debug-aubsan-classic-engine: + rhel88-debug-aubsan-classic-engine: - task: update_timeseries_fuzzer exec_timeout: 180 # 3 hours diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index ea11863875c..d6d2b7a299a 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -24,13 +24,13 @@ variables: - enterprise-debian12-64 - enterprise-rhel-81-ppc64le - ubi8 - - rhel80 - - rhel-82-arm64 + - rhel88 + - rhel-88-arm64 - rhel93 - rhel93-arm64 - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-suggested # For testing selinux. - - enterprise-rhel-82-arm64 + - enterprise-rhel-88-64-bit + - enterprise-rhel-88-64-bit-suggested # For testing selinux. + - enterprise-rhel-88-arm64 - enterprise-rhel-83-s390x - enterprise-rhel-93-64-bit - enterprise-rhel-93-arm64 diff --git a/etc/evergreen_yml_components/tasks/compile_tasks.yml b/etc/evergreen_yml_components/tasks/compile_tasks.yml index 51c94b9af72..38f099b7eeb 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks.yml @@ -147,10 +147,10 @@ variables: - enterprise-macos - enterprise-macos-arm64 - enterprise-rhel-81-ppc64le - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-coverage - - enterprise-rhel-80-64-bit-suggested - - enterprise-rhel-82-arm64 + - enterprise-rhel-88-64-bit + - enterprise-rhel-88-64-bit-coverage + - enterprise-rhel-88-64-bit-suggested + - enterprise-rhel-88-arm64 - enterprise-rhel-83-s390x - enterprise-rhel-90-64-bit - enterprise-rhel-90-arm64 diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev.yml b/etc/evergreen_yml_components/variants/amazon/test_dev.yml index 98705f46649..3c7e7bc5683 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev.yml @@ -273,7 +273,7 @@ buildvariants: --opt=off --dbg=on --ssl - MONGO_DISTMOD=rhel82 + MONGO_DISTMOD=amazon2023 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic diff --git a/etc/evergreen_yml_components/variants/misc/misc.yml b/etc/evergreen_yml_components/variants/misc/misc.yml index 8286ef55ee8..fd4875ef480 100644 --- a/etc/evergreen_yml_components/variants/misc/misc.yml +++ b/etc/evergreen_yml_components/variants/misc/misc.yml @@ -10,17 +10,17 @@ buildvariants: tags: ["required"] patch_only: true run_on: - - rhel80-medium + - rhel8.8-medium expansions: - large_distro_name: rhel80-large - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-large + core_analyzer_distro_name: rhel8.8-xlarge burn_in_tag_include_all_required_and_suggested: true burn_in_tag_exclude_build_variants: >- macos-debug-suggested - enterprise-rhel-80-64-bit-dynamic-embedded-router + enterprise-rhel-88-64-bit-dynamic-embedded-router burn_in_tag_include_build_variants: >- - enterprise-rhel-80-64-bit-inmem - enterprise-rhel-80-64-bit-multiversion + enterprise-rhel-88-64-bit-inmem + enterprise-rhel-88-64-bit-multiversion amazon-linux2-arm64-try-sbe-engine burn_in_tag_compile_task_dependency: archive_dist_test_debug compile_variant: &amazon_linux2_arm64_dynamic_compile_variant_name amazon-linux2-arm64-dynamic-compile @@ -189,16 +189,16 @@ buildvariants: tasks: - name: compile_ninja_fast_icecc_TG - - name: enterprise-rhel-80-64-bit-dynamic-ninja - display_name: "Ninja Build: Enterprise RHEL 8.0" + - name: enterprise-rhel-88-64-bit-dynamic-ninja + display_name: "Ninja Build: Enterprise RHEL 8.8" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -206,7 +206,7 @@ buildvariants: tasks: - name: compile_ninja_next_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: compile_ninja_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge 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 dc3cff81587..8f015ea2189 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 @@ -10,7 +10,7 @@ buildvariants: tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: multiversion_platform: rhel80 multiversion_edition: enterprise @@ -24,4 +24,4 @@ buildvariants: - name: daily_task_scanner - name: monitor_build_status distros: - - rhel80-large + - rhel8.8-large diff --git a/etc/evergreen_yml_components/variants/misc/task_generation.yml b/etc/evergreen_yml_components/variants/misc/task_generation.yml index 03f81c154fa..fd41973cbd7 100644 --- a/etc/evergreen_yml_components/variants/misc/task_generation.yml +++ b/etc/evergreen_yml_components/variants/misc/task_generation.yml @@ -6,7 +6,7 @@ buildvariants: tags: ["required"] activate: true run_on: - - rhel80-medium + - rhel8.8-medium tasks: - name: version_gen - name: version_burn_in_gen diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev.yml b/etc/evergreen_yml_components/variants/rhel/test_dev.yml index 0387b4b8b14..5798e1816b2 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml @@ -11,7 +11,7 @@ variables: # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - &linux-x86-dynamic-compile-params # Essential set of compile parameters used for Linux dev variants. run_on: - - rhel80-xlarge + - rhel8.8-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. stepback: false @@ -25,7 +25,7 @@ variables: has_packages: false compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -59,8 +59,8 @@ variables: multiversion_platform: rhel80 multiversion_edition: enterprise repo_edition: enterprise - large_distro_name: rhel80-medium - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-medium + core_analyzer_distro_name: rhel8.8-xlarge num_scons_link_jobs_available: 0.99 compile_variant: *linux_x86_dynamic_compile_variant_name @@ -69,7 +69,7 @@ variables: # - etc/evergreen_yml_components/variants/rhel/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - - &enterprise-rhel-80-64-bit-dynamic-expansions + - &enterprise-rhel-88-64-bit-dynamic-expansions <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all @@ -80,7 +80,7 @@ variables: max_sub_suites: 5 idle_timeout_factor: 1.5 exec_timeout_factor: 1.5 - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium buildvariants: - <<: *linux-x86-dynamic-compile-params @@ -99,22 +99,22 @@ buildvariants: - name: .release_critical .requires_compile_variant !.requires_large_host !.incompatible_development_variant !.stitch !.crypt - name: .release_critical .requires_compile_variant .requires_large_host !.incompatible_development_variant !.stitch !.crypt distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .default .requires_compile_variant !.requires_large_host !.incompatible_development_variant - name: .default .requires_compile_variant .requires_large_host !.incompatible_development_variant distros: - - rhel80-xlarge + - rhel8.8-xlarge - - &enterprise-rhel-80-64-bit-dynamic-template + - &enterprise-rhel-88-64-bit-dynamic-template <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic - display_name: "* Shared Library Enterprise RHEL 8.0" + name: &enterprise-rhel-88-64-bit-dynamic enterprise-rhel-88-64-bit-dynamic + display_name: "* Shared Library Enterprise RHEL 8.8" tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-small + - rhel8.8-small expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions depends_on: - name: archive_dist_test_debug variant: *linux_x86_dynamic_compile_variant_name @@ -127,29 +127,29 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - name: .release_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - name: .default !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags - name: .default .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.requires_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium # TODO (SERVER-75884): Remove this variant once we switch to config shard as the default. # This build variant is used to test suites that use sharded cluster fixture with config shard mode. - - &enterprise-rhel-80-64-bit-dynamic-config-shard + - &enterprise-rhel-88-64-bit-dynamic-config-shard <<: *linux_x86_dynamic_compile_variant_dependency - name: enterprise-rhel-80-64-bit-dynamic-config-shard - display_name: "* Shared Library Enterprise RHEL 8.0 (Config Shard)" + name: enterprise-rhel-88-64-bit-dynamic-config-shard + display_name: "* Shared Library Enterprise RHEL 8.8 (Config Shard)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small stepback: false - expansions: &enterprise-rhel-80-64-bit-dynamic-config-shard-expansions - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + expansions: &enterprise-rhel-88-64-bit-dynamic-config-shard-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions test_flags: >- --configShard=any --excludeWithAnyTags=config_shard_incompatible @@ -187,20 +187,20 @@ buildvariants: - name: .concurrency .sharded .large - name: .unsplittable_collections distros: - - rhel80-medium + - rhel8.8-medium - name: .multi_shard - - &enterprise-rhel-80-64-bit-dynamic-classic-engine + - &enterprise-rhel-88-64-bit-dynamic-classic-engine <<: *linux_x86_dynamic_compile_variant_dependency - name: enterprise-rhel-80-64-bit-dynamic-classic-engine - display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)" + name: enterprise-rhel-88-64-bit-dynamic-classic-engine + display_name: "Shared Library Enterprise RHEL 8.8 (Classic Engine)" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small stepback: false expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions jstestfuzz_num_generated_files: 40 jstestfuzz_concurrent_num_files: 10 target_resmoke_time: 10 @@ -208,7 +208,7 @@ buildvariants: test_flags: >- --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}" --excludeWithAnyTags=featureFlagSbeFull - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium depends_on: - name: archive_dist_test_debug variant: *linux_x86_dynamic_compile_variant_name @@ -227,7 +227,7 @@ buildvariants: - name: .concurrency !.large !.no_txns !.compute_mode !.feature_flag_guarded - name: .concurrency .large !.no_txns !.compute_mode !.feature_flag_guarded distros: - - rhel80-medium + - rhel8.8-medium - name: .encrypt - name: .jscore .common !jsCore !.sbe_only - name: .jstestfuzz !.feature_flag_guarded !.flow_control @@ -240,17 +240,17 @@ buildvariants: - name: .read_write_concern !.large - name: .read_write_concern .large distros: - - rhel80-medium + - rhel8.8-medium - name: .replica_sets !.encrypt !.auth distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .rollbackfuzzer - name: .sharding .common !.feature_flag_guarded - name: .sharding .jscore !.wo_snapshot !.multi_stmt !.feature_flag_guarded - name: .sharding .txns - name: .serverless distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .updatefuzzer - name: aggregation_repeat_queries_multiplan_single_solutions - name: audit @@ -270,7 +270,7 @@ buildvariants: - name: fcv_upgrade_downgrade_sharded_collections_jscore_passthrough_gen - name: jsCore distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: jsCore_min_batch_repeat_queries_multiplan_single_solutions_ese_gsm - name: jsCore_txns_large_txns_format - name: json_schema @@ -281,22 +281,22 @@ buildvariants: - name: replica_sets_reconfig_jscore_passthrough_gen - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: replica_sets_reconfig_kill_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_pre_images_replica_sets_kill_secondary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_change_collection_replica_sets_kill_secondary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: retryable_writes_jscore_passthrough_gen - name: retryable_writes_jscore_stepdown_passthrough_gen - name: sasl 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 ae3ff25b8f2..16ceff1e620 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 @@ -33,18 +33,18 @@ variables: multiversion_platform: rhel80 multiversion_edition: enterprise repo_edition: enterprise - large_distro_name: rhel80-medium - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-medium + core_analyzer_distro_name: rhel8.8-xlarge num_scons_link_jobs_available: 0.99 compile_variant: *linux_x86_dynamic_compile_variant_name buildvariants: - - name: enterprise-rhel-80-64-bit-inmem - display_name: Enterprise RHEL 8.0 (inMemory) + - name: enterprise-rhel-88-64-bit-inmem + display_name: Enterprise RHEL 8.8 (inMemory) tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: additional_package_targets: >- archive-mongocryptd @@ -54,23 +54,23 @@ buildvariants: --excludeWithAnyTags=requires_persistence,requires_journaling compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=on multiversion_platform: rhel80 multiversion_edition: enterprise scons_cache_scope: shared - large_distro_name: rhel80-large - core_analyzer_distro_name: rhel80-xlarge - compile_variant: enterprise-rhel-80-64-bit-inmem + large_distro_name: rhel8.8-large + core_analyzer_distro_name: rhel8.8-xlarge + compile_variant: enterprise-rhel-88-64-bit-inmem tasks: - name: compile_test_serial_no_unittests_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: compile_integration_and_test_no_audit_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggfuzzer .common !.feature_flag_guarded - name: .aggregation !.unwind !.encrypt !.feature_flag_guarded - name: audit @@ -81,7 +81,7 @@ buildvariants: - name: .misc_js - name: .concurrency !.no_txns !.kill_terminate !.incompatible_inmemory !.feature_flag_guarded distros: - - rhel80-medium # Some workloads require a lot of memory, use a bigger machine for this suite. + - rhel8.8-medium # Some workloads require a lot of memory, use a bigger machine for this suite. - name: initial_sync_fuzzer_gen - name: .jscore .common !.decimal - name: jsCore_txns_large_txns_format @@ -96,7 +96,7 @@ buildvariants: - name: replica_sets_multi_stmt_txn_jscore_passthrough_gen - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen distros: - - rhel80-medium + - rhel8.8-medium - name: .resharding_fuzzer - name: .retry - name: rollback_fuzzer_gen @@ -105,7 +105,7 @@ buildvariants: - name: session_jscore_passthrough - name: sharded_multi_stmt_txn_jscore_passthrough_gen distros: - - rhel80-medium + - rhel8.8-medium - name: .sharding .jscore !.wo_snapshot !.multi_stmt !.feature_flag_guarded - name: .sharding .common !.multiversion !.csrs !.encrypt !.feature_flag_guarded - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen @@ -114,12 +114,12 @@ buildvariants: - name: generate_buildid_to_debug_symbols_mapping - <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-large-txns-format enterprise-rhel-80-64-bit-large-txns-format - display_name: "Enterprise RHEL 8.0 (large transactions format)" + name: &enterprise-rhel-88-64-bit-large-txns-format enterprise-rhel-88-64-bit-large-txns-format + display_name: "Enterprise RHEL 8.8 (large transactions format)" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions test_flags: >- @@ -159,7 +159,7 @@ buildvariants: - name: .replica_sets !.multi_oplog !.large - name: .replica_sets !.multi_oplog .large distros: - - rhel80-medium + - rhel8.8-medium - name: .replica_sets .encrypt - name: .resharding_fuzzer - name: .rollbackfuzzer @@ -171,4 +171,4 @@ buildvariants: - name: sharding_csrs_continuous_config_stepdown_gen - name: sharded_multi_stmt_txn_jscore_passthrough_gen distros: - - rhel80-medium + - rhel8.8-medium 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 55aa04b6127..cb0483f1d25 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 @@ -11,7 +11,7 @@ variables: # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - &linux-x86-dynamic-compile-params # Essential set of compile parameters used for Linux dev variants. run_on: - - rhel80-xlarge + - rhel8.8-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. stepback: false @@ -25,7 +25,7 @@ variables: has_packages: false compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -38,7 +38,7 @@ variables: # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - &generic_linux_compile_params # Essential set of compile parameters used for Linux dev variants. run_on: - - rhel80-xlarge + - rhel8.8-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. tasks: - name: compile_test_parallel_core_stream_TG @@ -85,8 +85,8 @@ variables: multiversion_platform: rhel80 multiversion_edition: enterprise repo_edition: enterprise - large_distro_name: rhel80-medium - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-medium + core_analyzer_distro_name: rhel8.8-xlarge num_scons_link_jobs_available: 0.99 compile_variant: *linux_x86_dynamic_compile_variant_name @@ -95,7 +95,7 @@ variables: # - etc/evergreen_yml_components/variants/rhel/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - - &enterprise-rhel-80-64-bit-dynamic-expansions + - &enterprise-rhel-88-64-bit-dynamic-expansions <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all @@ -106,25 +106,25 @@ variables: max_sub_suites: 5 idle_timeout_factor: 1.5 exec_timeout_factor: 1.5 - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium - - &enterprise-rhel-80-64-bit-template - name: enterprise-rhel-80-64-bit - display_name: "Enterprise RHEL 8.0" + - &enterprise-rhel-88-64-bit-template + name: enterprise-rhel-88-64-bit + display_name: "Enterprise RHEL 8.8" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small - expansions: &enterprise-rhel-80-64-bit-expansions-template + - rhel8.8-small + expansions: &enterprise-rhel-88-64-bit-expansions-template additional_package_targets: >- archive-mongocryptd archive-mongocryptd-debug push_path: linux push_bucket: downloads.10gen.com push_name: linux - push_arch: x86_64-enterprise-rhel80 + push_arch: x86_64-enterprise-rhel88 compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=on @@ -137,14 +137,14 @@ variables: has_packages: true packager_script: packager_enterprise.py packager_arch: x86_64 - packager_distro: rhel80 + packager_distro: rhel88 repo_edition: enterprise scons_cache_scope: shared - core_analyzer_distro_name: rhel80-large + core_analyzer_distro_name: rhel8.8-large tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggfuzzer !.feature_flag_guarded - name: audit - name: auth_audit_gen @@ -238,7 +238,7 @@ buildvariants: <<: *generic_linux_compile_expansions compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -246,7 +246,7 @@ buildvariants: --use-diagnostic-latches=on compile_variant: *linux-x86-dynamic-grpc-suggested clang_tidy_toolchain: v4 - large_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-xlarge test_flags: >- --additionalFeatureFlags "featureFlagGRPC" --excludeWithAnyTags=requires_external_data_source,requires_mongobridge,requires_auth,grpc_incompatible,creates_and_authenticates_user @@ -269,22 +269,22 @@ buildvariants: - name: .lint - name: libdeps_graph_linting distros: - - rhel80-large + - rhel8.8-large - name: .clang_tidy distros: - - rhel80-xxlarge + - rhel8.8-xxlarge - - &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template + - &enterprise-rhel-88-64-bit-dynamic-all-feature-flags-template <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags enterprise-rhel-80-64-bit-dynamic-all-feature-flags - display_name: "* Shared Library Enterprise RHEL 8.0 (all feature flags)" + name: &enterprise-rhel-88-64-bit-dynamic-all-feature-flags enterprise-rhel-88-64-bit-dynamic-all-feature-flags + display_name: "* Shared Library Enterprise RHEL 8.8 (all feature flags)" tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-small + - rhel8.8-small stepback: false - expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + expansions: &enterprise-rhel-88-64-bit-dynamic-all-feature-flags-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions # To force disable feature flags even on the all feature flags variant, please use this file: # buildscripts/resmokeconfig/fully_disabled_feature_flags.yml test_flags: >- @@ -312,33 +312,33 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - name: .release_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - name: .default !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags - name: .default .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium # TODO(SERVER-90936): Remove this once streams_kafka* tests can work with the "default" tag. - name: streams_kafka - name: streams_kafka_gwproxy # This build variant is used to test suites that use sharded cluster fixture with embedded router mode. # Also supports ProgramRunner/ShardingTest driven suites that look for an embedded router flag in TestData. - - &enterprise-rhel-80-64-bit-dynamic-embedded-router-all-feature-flags + - &enterprise-rhel-88-64-bit-dynamic-embedded-router-all-feature-flags <<: *linux_x86_dynamic_compile_variant_dependency - name: enterprise-rhel-80-64-bit-dynamic-embedded-router - display_name: "* Shared Library Enterprise RHEL 8.0 (Embedded Router all feature flags)" + name: enterprise-rhel-88-64-bit-dynamic-embedded-router + display_name: "* Shared Library Enterprise RHEL 8.8 (Embedded Router all feature flags)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small stepback: false activate: true - expansions: &enterprise-rhel-80-64-bit-dynamic-embedded-router-expansions - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + expansions: &enterprise-rhel-88-64-bit-dynamic-embedded-router-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions test_flags: >- --embeddedRouter=true --runAllFeatureFlagTests @@ -348,56 +348,56 @@ buildvariants: # This build variant is used to test feature parity between replica set and sharded cluster # connected via replica set endpoint. - - &enterprise-rhel-80-64-bit-dynamic-replica-set-endpoint-all-feature-flags + - &enterprise-rhel-88-64-bit-dynamic-replica-set-endpoint-all-feature-flags <<: *linux_x86_dynamic_compile_variant_dependency - name: enterprise-rhel-80-64-bit-dynamic-replica-set-endpoint - display_name: "* Shared Library Enterprise RHEL 8.0 (Replica Set Endpoint all feature flags)" + name: enterprise-rhel-88-64-bit-dynamic-replica-set-endpoint + display_name: "* Shared Library Enterprise RHEL 8.8 (Replica Set Endpoint all feature flags)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small stepback: false activate: true expansions: - &enterprise-rhel-80-64-bit-dynamic-replica-set-endpoint-expansions - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + &enterprise-rhel-88-64-bit-dynamic-replica-set-endpoint-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions test_flags: >- --runAllFeatureFlagTests tasks: - name: .replica_set_endpoint - - name: &enterprise-rhel-80-benchmarks enterprise-rhel-80-benchmarks - display_name: "* Enterprise RHEL 8.0 (Benchmarks)" + - name: &enterprise-rhel-88-benchmarks enterprise-rhel-88-benchmarks + display_name: "* Enterprise RHEL 8.8 (Benchmarks)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-medium + - rhel8.8-medium expansions: compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --use-diagnostic-latches=on scons_cache_scope: shared num_scons_link_jobs_available: 0.5 - compile_variant: *enterprise-rhel-80-benchmarks + compile_variant: *enterprise-rhel-88-benchmarks tasks: - name: compile_upload_benchmarks_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .benchmarks # 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. - &linux-x86-multiversion-template <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-multiversion enterprise-rhel-80-64-bit-multiversion - display_name: "Enterprise RHEL 8.0 (implicit multiversion)" + name: &enterprise-rhel-88-64-bit-multiversion enterprise-rhel-88-64-bit-multiversion + display_name: "Enterprise RHEL 8.8 (implicit multiversion)" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: &linux-x86-multiversion-expansions-template <<: *linux_x86_generic_expansions resmoke_jobs_factor: 0.25 @@ -407,8 +407,8 @@ buildvariants: - name: .random_multiversion_ds - <<: *linux-x86-multiversion-template - name: &enterprise-rhel-80-64-bit-multiversion-all-feature-flags enterprise-rhel-80-64-bit-multiversion-all-feature-flags - display_name: "Enterprise RHEL 8.0 (implicit multiversion & all feature flags)" + name: &enterprise-rhel-88-64-bit-multiversion-all-feature-flags enterprise-rhel-88-64-bit-multiversion-all-feature-flags + display_name: "Enterprise RHEL 8.8 (implicit multiversion & all feature flags)" tags: [] expansions: <<: *linux-x86-multiversion-expansions-template @@ -419,10 +419,10 @@ buildvariants: # This variant exists because this is the only way to test future multiversion tags # version_expansions_gen will pretend we are upgrading to "bv_future_git_tag" # which is like simulating a branching task - - &enterprise-rhel-80-64-bit-future-git-tag-multiversion-template + - &enterprise-rhel-88-64-bit-future-git-tag-multiversion-template <<: *linux-x86-multiversion-template - name: &enterprise-rhel-80-64-bit-future-git-tag-multiversion enterprise-rhel-80-64-bit-future-git-tag-multiversion - display_name: "Enterprise RHEL 8.0 (future git tag multiversion)" + name: &enterprise-rhel-88-64-bit-future-git-tag-multiversion enterprise-rhel-88-64-bit-future-git-tag-multiversion + display_name: "Enterprise RHEL 8.8 (future git tag multiversion)" tags: [] expansions: <<: *linux_x86_generic_expansions @@ -450,25 +450,25 @@ buildvariants: - name: .multiversion !.future_git_tag_incompatible - name: .multiversion_future_git_tag - - <<: *enterprise-rhel-80-64-bit-template - name: &hot_backups-rhel-80-64-bit hot_backups-rhel-80-64-bit - display_name: "hot_backups RHEL 8.0" + - <<: *enterprise-rhel-88-64-bit-template + name: &hot_backups-rhel-88-64-bit hot_backups-rhel-88-64-bit + display_name: "hot_backups RHEL 8.8" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: - <<: *enterprise-rhel-80-64-bit-expansions-template + <<: *enterprise-rhel-88-64-bit-expansions-template additional_package_targets: "" compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --enterprise-features=hot_backups,magic_restore,ldap,sasl --link-model=dynamic --use-diagnostic-latches=on - compile_variant: *hot_backups-rhel-80-64-bit + compile_variant: *hot_backups-rhel-88-64-bit has_packages: false scons_cache_mode: all scons_cache_scope: shared @@ -476,27 +476,27 @@ buildvariants: tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: jsCore - name: noPassthroughHotBackups_gen - name: generate_buildid_to_debug_symbols_mapping - - name: &enterprise-rhel80-sdam-replica-set-monitor-64-bit enterprise-rhel80-sdam-replica-set-monitor-64-bit - display_name: "~ Enterprise RHEL 8.0 (with SdamReplicaSetMonitor)" + - name: &enterprise-rhel88-sdam-replica-set-monitor-64-bit enterprise-rhel88-sdam-replica-set-monitor-64-bit + display_name: "~ Enterprise RHEL 8.8 (with SdamReplicaSetMonitor)" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -505,21 +505,21 @@ buildvariants: --mongosSetParameters="{replicaSetMonitorProtocol: sdam}" --mongodSetParameters="{replicaSetMonitorProtocol: sdam}" --excludeWithAnyTags=requires_streamable_rsm - large_distro_name: rhel80-build - compile_variant: *enterprise-rhel80-sdam-replica-set-monitor-64-bit + large_distro_name: rhel8.8-large + compile_variant: *enterprise-rhel88-sdam-replica-set-monitor-64-bit tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggregation !.no_async !.feature_flag_guarded - name: sharding_auth_gen - name: .sharding .causally_consistent !.wo_snapshot @@ -530,16 +530,16 @@ buildvariants: - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen - name: generate_buildid_to_debug_symbols_mapping - - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit - display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchPrimaryNode"})' + - name: &enterprise-rhel88-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel88-sharding-task-executor-pool-rsm-matchPrimary-64-bit + display_name: '~ Enterprise RHEL 8.8 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchPrimaryNode"})' tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -547,21 +547,21 @@ buildvariants: test_flags: >- --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"" --excludeWithAnyTags=sets_replica_set_matching_strategy - large_distro_name: rhel80-build - compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit + large_distro_name: rhel8.8-large + compile_variant: *enterprise-rhel88-sharding-task-executor-pool-rsm-matchPrimary-64-bit tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggregation !.no_async !.feature_flag_guarded - name: sharding_auth_gen - name: .sharding .causally_consistent !.wo_snapshot @@ -572,19 +572,19 @@ buildvariants: - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen - name: generate_buildid_to_debug_symbols_mapping - - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit - display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchBusiestNode"})' + - name: &enterprise-rhel88-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel88-sharding-task-executor-pool-rsm-matchBusiest-64-bit + display_name: '~ Enterprise RHEL 8.8 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchBusiestNode"})' tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all num_scons_link_jobs_available: 0.99 compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -594,21 +594,21 @@ buildvariants: test_flags: >- --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"" --excludeWithAnyTags=sets_replica_set_matching_strategy - large_distro_name: rhel80-build - compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit + large_distro_name: rhel8.8-large + compile_variant: *enterprise-rhel88-sharding-task-executor-pool-rsm-matchBusiest-64-bit tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggregation !.no_async !.feature_flag_guarded - name: sharding_auth_gen - name: .sharding .causally_consistent !.wo_snapshot @@ -619,19 +619,19 @@ buildvariants: - name: sharding_max_mirroring_opportunistic_secondary_targeting_gen - name: generate_buildid_to_debug_symbols_mapping - - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit - display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "disabled"})' + - name: &enterprise-rhel88-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel88-sharding-task-executor-pool-rsm-disabled-64-bit + display_name: '~ Enterprise RHEL 8.8 (with {ShardingTaskExecutorPoolReplicaSetMatching: "disabled"})' tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all num_scons_link_jobs_available: 0.99 compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -641,21 +641,21 @@ buildvariants: test_flags: >- --mongosSetParameters="ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"" --excludeWithAnyTags=sets_replica_set_matching_strategy - large_distro_name: rhel80-build - compile_variant: *enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit + large_distro_name: rhel8.8-large + compile_variant: *enterprise-rhel88-sharding-task-executor-pool-rsm-disabled-64-bit tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: .aggregation !.no_async !.feature_flag_guarded - name: sharding_auth_gen - name: .sharding .causally_consistent !.wo_snapshot @@ -669,12 +669,12 @@ buildvariants: # This build variant injects old-format (pre-4.2) unique index keys for all new keys inserted into # a index. This should not change correctness or user-observable server behavior. - <<: *linux_x86_dynamic_compile_variant_dependency - name: &enterprise-rhel-80-64-bit-old-unique-index-format enterprise-rhel-80-64-bit-old-unique-index-format - display_name: "Enterprise RHEL 8.0 (old unique index format)" + name: &enterprise-rhel-88-64-bit-old-unique-index-format enterprise-rhel-88-64-bit-old-unique-index-format + display_name: "Enterprise RHEL 8.8 (old unique index format)" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions test_flags: >- @@ -708,17 +708,17 @@ buildvariants: - name: .updatefuzzer - name: v1index_jscore_passthrough_gen - - name: &enterprise-rhel80-join-ingress-sessions-on-shutdown enterprise-rhel80-join-ingress-sessions-on-shutdown - display_name: '~ Enterprise RHEL 8.0 (with {joinIngressSessionsOnShutdown: "true"})' + - name: &enterprise-rhel88-join-ingress-sessions-on-shutdown enterprise-rhel88-join-ingress-sessions-on-shutdown + display_name: '~ Enterprise RHEL 8.8 (with {joinIngressSessionsOnShutdown: "true"})' tags: [] activate: false run_on: - - rhel80-small + - rhel8.8-small expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -728,19 +728,19 @@ buildvariants: test_flags: >- --mongosSetParameters="joinIngressSessionsOnShutdown: \"true\"" --mongodSetParameters="joinIngressSessionsOnShutdown: \"true\"" - large_distro_name: rhel80-build - compile_variant: *enterprise-rhel80-join-ingress-sessions-on-shutdown + large_distro_name: rhel8.8-large + compile_variant: *enterprise-rhel88-join-ingress-sessions-on-shutdown tasks: - name: compile_test_serial_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large patch_only: true - name: compile_integration_and_test_no_audit_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large patch_only: true - name: .aggregation !.no_async !.feature_flag_guarded patch_only: true @@ -761,15 +761,15 @@ buildvariants: ### QO & QE Patch-Specific Build Variants ### - - name: &enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only - display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (Classic Engine)" + - name: &enterprise-rhel-88-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-88-64-bit-dynamic-classic-engine-query-patch-only + display_name: "~ Shared Library Enterprise RHEL 8.8 Query Patch Only (Classic Engine)" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. run_on: - - rhel80-small + - rhel8.8-small stepback: false expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-expansions jstestfuzz_num_generated_files: 20 jstestfuzz_concurrent_num_files: 5 target_resmoke_time: 30 @@ -795,7 +795,7 @@ buildvariants: - name: .concurrency !.large !.no_txns !.compute_mode !.feature_flag_guarded - name: .concurrency .large !.no_txns !.compute_mode !.feature_flag_guarded distros: - - rhel80-medium + - rhel8.8-medium - name: .encrypt - name: .jscore .common !jsCore !.sbe_only - name: .jstestfuzz !.feature_flag_guarded !.flow_control @@ -808,17 +808,17 @@ buildvariants: - name: .read_write_concern !.large - name: .read_write_concern .large distros: - - rhel80-medium + - rhel8.8-medium - name: .replica_sets !.encrypt !.auth distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .rollbackfuzzer - name: .sharding .common !.feature_flag_guarded - name: .sharding .jscore !.wo_snapshot !.multi_stmt !.feature_flag_guarded - name: .sharding .txns - name: .serverless distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .updatefuzzer - name: aggregation_repeat_queries_multiplan_single_solutions - name: audit @@ -838,7 +838,7 @@ buildvariants: - name: fcv_upgrade_downgrade_sharded_collections_jscore_passthrough_gen - name: jsCore distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: jsCore_min_batch_repeat_queries_multiplan_single_solutions_ese_gsm - name: jsCore_txns_large_txns_format - name: json_schema @@ -849,22 +849,22 @@ buildvariants: - name: replica_sets_reconfig_jscore_passthrough_gen - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: replica_sets_reconfig_kill_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_pre_images_replica_sets_stepdown_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_pre_images_replica_sets_kill_secondary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_change_collection_replica_sets_stepdown_primary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: change_streams_change_collection_replica_sets_kill_secondary_jscore_passthrough_gen distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: retryable_writes_jscore_passthrough_gen - name: retryable_writes_jscore_stepdown_passthrough_gen - name: sasl @@ -885,13 +885,13 @@ buildvariants: - name: cursor_hints_to_query_settings_unsharded_collections_passthrough_gen - name: implicit_query_settings_fallback - - name: enterprise-rhel-80-64-bit-dynamic-classic-engine-all-feature-flags-fuzzers - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template - display_name: "*| Shared Library Enterprise RHEL 8.0 (Classic Engine all feature flags) Fuzzers" + - name: enterprise-rhel-88-64-bit-dynamic-classic-engine-all-feature-flags-fuzzers + <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-template + display_name: "*| Shared Library Enterprise RHEL 8.8 (Classic Engine all feature flags) Fuzzers" tags: ["suggested"] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-expansions jstestfuzz_num_generated_files: 20 jstestfuzz_concurrent_num_files: 5 target_resmoke_time: 30 @@ -906,13 +906,13 @@ buildvariants: - name: .query_fuzzer - name: .updatefuzzer - - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template - name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only - display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (all feature flags)" + - <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-template + name: &enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required-query-patch-only enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required-query-patch-only + display_name: "~ Shared Library Enterprise RHEL 8.8 Query Patch Only (all feature flags)" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-expansions jstestfuzz_num_generated_files: 20 jstestfuzz_concurrent_num_files: 5 target_resmoke_time: 30 @@ -922,13 +922,13 @@ buildvariants: --excludeWithAnyTags=resource_intensive ### Security Patch-Specific Build Variants ### - - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template - name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only - display_name: "~ Shared Library Enterprise RHEL 8.0 Security Patch Only (all feature flags)" + - <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-template + name: &enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required-security-patch-only + display_name: "~ Shared Library Enterprise RHEL 8.8 Security Patch Only (all feature flags)" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions + <<: *enterprise-rhel-88-64-bit-dynamic-all-feature-flags-expansions target_resmoke_time: 15 max_sub_suites: 15 tasks: @@ -951,7 +951,7 @@ buildvariants: display_name: "TLA+" tags: [] run_on: - - rhel80-build + - rhel8.8-large cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter stepback: false expansions: diff --git a/etc/evergreen_yml_components/variants/rhel/test_release.yml b/etc/evergreen_yml_components/variants/rhel/test_release.yml index 28e9825389d..a828331a415 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_release.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml @@ -15,7 +15,7 @@ buildvariants: resmoke_jobs_factor: 1 disable_shared_scons_cache: true compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars @@ -29,27 +29,27 @@ buildvariants: tasks: - name: compile_and_archive_dist_test_TG distros: - - rhel80-large + - rhel8.8-large - name: jsCore - name: sharding_gen - name: replica_sets_gen - name: generate_buildid_to_debug_symbols_mapping distros: - - rhel80-large + - rhel8.8-large - - name: rhel80 - display_name: RHEL 8.0 + - name: rhel88 + display_name: RHEL 8.8 tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large expansions: push_path: linux push_bucket: downloads.mongodb.org push_name: linux - push_arch: x86_64-rhel80 + push_arch: x86_64-rhel88 compile_flags: >- - --ssl MONGO_DISTMOD=rhel80 + --ssl MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --modules= @@ -61,15 +61,15 @@ buildvariants: has_packages: true packager_script: packager.py packager_arch: x86_64 - packager_distro: rhel80 + packager_distro: rhel88 repo_edition: org scons_cache_scope: shared - large_distro_name: rhel80-build - compile_variant: rhel80 + large_distro_name: rhel8.8-large + compile_variant: rhel88 tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - rhel80-build + - rhel8.8-large - name: test_packages distros: - ubuntu2204-large @@ -77,28 +77,28 @@ buildvariants: - name: .development_critical !.requires_large_host !.incompatible_community - name: .development_critical .requires_large_host !.incompatible_community distros: - - rhel80-large + - rhel8.8-large - name: .release_critical !.requires_large_host !.incompatible_community - name: .release_critical .requires_large_host !.incompatible_community distros: - - rhel80-large + - rhel8.8-large - - name: enterprise-rhel-80-64-bit - display_name: "Enterprise RHEL 8.0" + - name: enterprise-rhel-88-64-bit + display_name: "Enterprise RHEL 8.8" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-small - expansions: &enterprise-rhel-80-64-bit-expansions + - rhel8.8-small + expansions: &enterprise-rhel-88-64-bit-expansions additional_package_targets: >- archive-mongocryptd archive-mongocryptd-debug push_path: linux push_bucket: downloads.10gen.com push_name: linux - push_arch: x86_64-enterprise-rhel80 + push_arch: x86_64-enterprise-rhel88 compile_flags: >- - --ssl MONGO_DISTMOD=rhel80 + --ssl MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer @@ -117,17 +117,17 @@ buildvariants: jstestfuzz_concurrent_num_files: 10 target_resmoke_time: 10 max_sub_suites: 3 - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium # TODO SERVER-64479 remove external_auth_jobs_max once resolved external_auth_jobs_max: 1 - compile_variant: enterprise-rhel-80-64-bit + compile_variant: enterprise-rhel-88-64-bit tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - rhel80-large + - rhel8.8-large - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: test_packages distros: - ubuntu2204-large @@ -135,25 +135,25 @@ buildvariants: - name: .development_critical !.requires_large_host - name: .development_critical .requires_large_host distros: - - rhel80-large + - rhel8.8-large - name: .release_critical !.requires_large_host - name: .release_critical .requires_large_host distros: - - rhel80-large + - rhel8.8-large - - name: rhel-82-arm64 - display_name: RHEL 8.2 arm64 + - name: rhel-88-arm64 + display_name: RHEL 8.8 arm64 cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] run_on: - - rhel82-arm64-small + - rhel8.8-arm64-small expansions: push_path: linux push_bucket: downloads.mongodb.org push_name: linux - push_arch: aarch64-rhel82 + push_arch: aarch64-rhel88 compile_flags: >- - --ssl MONGO_DISTMOD=rhel82 + --ssl MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --modules= @@ -163,33 +163,33 @@ buildvariants: has_packages: true packager_script: packager.py packager_arch: aarch64 - packager_distro: rhel82 + packager_distro: rhel88 repo_edition: org scons_cache_scope: shared - large_distro_name: rhel82-arm64-large - compile_variant: rhel-82-arm64 + large_distro_name: rhel8.8-arm64-large + compile_variant: rhel-88-arm64 tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - name: test_packages distros: - ubuntu1804-arm64-build - name: .development_critical !.requires_large_host !.incompatible_community - name: .development_critical .requires_large_host !.incompatible_community distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - name: .release_critical !.requires_large_host !.incompatible_community - name: .release_critical .requires_large_host !.incompatible_community distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - - name: enterprise-rhel-82-arm64 - display_name: "Enterprise RHEL 8.2 arm64" + - name: enterprise-rhel-88-arm64 + display_name: "Enterprise RHEL 8.8 arm64" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel82-arm64-small + - rhel8.8-arm64-small expansions: additional_package_targets: >- archive-mongocryptd @@ -197,9 +197,9 @@ buildvariants: push_path: linux push_bucket: downloads.10gen.com push_name: linux - push_arch: aarch64-enterprise-rhel82 + push_arch: aarch64-enterprise-rhel88 compile_flags: >- - --ssl MONGO_DISTMOD=rhel82 + --ssl MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer,resource_intensive @@ -210,27 +210,27 @@ buildvariants: has_packages: true packager_script: packager_enterprise.py packager_arch: aarch64 - packager_distro: rhel82 + packager_distro: rhel88 repo_edition: enterprise scons_cache_scope: shared # TODO SERVER-64479 remove external_auth_jobs_max once resolved external_auth_jobs_max: 1 - compile_variant: enterprise-rhel-82-arm64 + compile_variant: enterprise-rhel-88-arm64 tasks: - name: compile_test_and_package_serial_no_unittests_TG distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - name: test_packages distros: - ubuntu1804-arm64-build - name: .development_critical !.requires_large_host - name: .development_critical .requires_large_host distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - name: .release_critical !.requires_large_host - name: .release_critical .requires_large_host distros: - - rhel82-arm64-large + - rhel8.8-arm64-large - name: rhel93 display_name: RHEL 9.3 @@ -418,12 +418,12 @@ buildvariants: distros: - rhel93-arm64-large - - name: enterprise-rhel-82-arm64-grpc - display_name: "Enterprise RHEL 8.2 arm64 GRPC" + - name: enterprise-rhel-88-arm64-grpc + display_name: "Enterprise RHEL 8.8 arm64 GRPC" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel82-arm64-large + - rhel8.8-arm64-large stepback: false expansions: test_flags: >- @@ -432,12 +432,12 @@ buildvariants: compile_flags: >- --ssl --dbg=on - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic ENABLE_GRPC_BUILD=1 - compile_variant: enterprise-rhel-82-arm64-grpc + compile_variant: enterprise-rhel-88-arm64-grpc scons_cache_scope: shared tasks: - name: compile_test_parallel_unittest_stream_TG diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml index af90ae2594c..521b0cfc107 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml @@ -12,7 +12,7 @@ variables: # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - &generic_linux_compile_params # Essential set of compile parameters used for Linux dev variants. run_on: - - rhel80-xlarge + - rhel8.8-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. tasks: - name: compile_test_parallel_core_stream_TG @@ -109,8 +109,8 @@ variables: hang_analyzer_dump_core: false max_sub_suites: 3 num_scons_link_jobs_available: 0.99 - large_distro_name: rhel80-build - xlarge_distro_name: rhel80-xxlarge + large_distro_name: rhel8.8-large + xlarge_distro_name: rhel8.8-xxlarge multiversion_platform: rhel80 multiversion_edition: enterprise gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov @@ -135,7 +135,7 @@ buildvariants: - name: .release_critical .requires_compile_variant !.requires_large_host !.incompatible_development_variant !.stitch !.crypt - name: .release_critical .requires_compile_variant .requires_large_host !.incompatible_development_variant !.stitch !.crypt distros: - - rhel80-xlarge + - rhel8.8-xlarge - <<: *generic_linux_compile_params name: &linux-debug-aubsan-compile-required linux-debug-aubsan-compile-required @@ -170,11 +170,11 @@ buildvariants: - name: .release_critical .requires_compile_variant !.requires_large_host !.incompatible_development_variant !.incompatible_aubsan - name: .release_critical .requires_compile_variant .requires_large_host !.incompatible_development_variant !.incompatible_aubsan distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .default .requires_compile_variant !.requires_large_host !.incompatible_development_variant !.incompatible_aubsan - name: .default .requires_compile_variant .requires_large_host !.incompatible_development_variant !.incompatible_aubsan distros: - - rhel80-xlarge + - rhel8.8-xlarge - &linux-64-debug-required-template <<: *linux_x86_dynamic_debug_compile_variant_dependency @@ -183,7 +183,7 @@ buildvariants: tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-medium + - rhel8.8-medium expansions: resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's test_flags: >- @@ -192,8 +192,8 @@ buildvariants: --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" target_resmoke_time: 15 max_sub_suites: 5 - large_distro_name: rhel80-medium - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-medium + core_analyzer_distro_name: rhel8.8-xlarge compile_variant: *linux_x86_dynamic_debug_compile_variant_name build_mongot: true download_mongot_release: true @@ -203,20 +203,20 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_community !.requires_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_community !.requires_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - name: .release_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_community !.requires_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_community !.requires_all_feature_flags distros: - - rhel80-medium + - rhel8.8-medium - - &rhel80-debug-aubsan-lite-all-feature-flags-required-template + - &rhel88-debug-aubsan-lite-all-feature-flags-required-template <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-lite-all-feature-flags-required rhel80-debug-aubsan-lite-all-feature-flags-required - display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + name: &rhel88-debug-aubsan-lite-all-feature-flags-required rhel88-debug-aubsan-lite-all-feature-flags-required + display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.8 DEBUG (all feature flags)" tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions # To force disable feature flags even on the all feature flags variant, please use this file: @@ -231,12 +231,12 @@ buildvariants: - name: jsCore_wildcard_indexes - <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan rhel80-debug-aubsan - display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG" + name: &rhel88-debug-aubsan rhel88-debug-aubsan + display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.8 DEBUG" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions test_flags: --excludeWithAnyTags=requires_increased_memlock_limits,incompatible_aubsan @@ -244,28 +244,28 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .release_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .default !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .default .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .non_deterministic !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .non_deterministic .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .search_e2e_tests - <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-experimental rhel80-debug-aubsan-experimental - display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG Experimental" + name: &rhel88-debug-aubsan-experimental rhel88-debug-aubsan-experimental + display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.8 DEBUG Experimental" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions test_flags: >- @@ -277,12 +277,12 @@ buildvariants: - name: .random_multiversion_ds - name: .watchdog - - name: rhel80-asan - display_name: ~ ASAN RHEL 8.0 + - name: rhel88-asan + display_name: ~ ASAN RHEL 8.8 tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large stepback: true expansions: lang_environment: LANG=C @@ -306,7 +306,7 @@ buildvariants: --excludeWithAnyTags=requires_fast_memory,corrupts_data --enableEnterpriseTests=off separate_debug: off - compile_variant: rhel80-asan + compile_variant: rhel88-asan tasks: - name: compile_test_serial_TG - name: compile_test_parallel_unittest_stream_TG @@ -314,13 +314,13 @@ buildvariants: - name: .jstestfuzz !.initsync !.feature_flag_guarded !.incompatible_system_allocator - name: generate_buildid_to_debug_symbols_mapping - - &rhel80-debug-aubsan-lite_fuzzer-template - name: &rhel80-debug-aubsan-lite_fuzzer rhel80-debug-aubsan-lite_fuzzer - display_name: "{A,UB}SAN Enterprise RHEL 8.0 FUZZER" + - &rhel88-debug-aubsan-lite_fuzzer-template + name: &rhel88-debug-aubsan-lite_fuzzer rhel88-debug-aubsan-lite_fuzzer + display_name: "{A,UB}SAN Enterprise RHEL 8.8 FUZZER" tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large stepback: false expansions: additional_package_targets: >- @@ -349,7 +349,7 @@ buildvariants: hang_analyzer_dump_core: false scons_cache_scope: shared separate_debug: off - compile_variant: *rhel80-debug-aubsan-lite_fuzzer + compile_variant: *rhel88-debug-aubsan-lite_fuzzer display_tasks: - name: libfuzzertests! execution_tasks: @@ -358,21 +358,21 @@ buildvariants: tasks: - name: compile_archive_and_run_libfuzzertests_TG - - &enterprise-rhel80-debug-tsan-template - name: &enterprise-rhel80-debug-tsan-compile enterprise-rhel80-debug-tsan-compile - display_name: "* TSAN Enterprise RHEL 8.0 DEBUG Compile" + - &enterprise-rhel88-debug-tsan-template + name: &enterprise-rhel88-debug-tsan-compile enterprise-rhel88-debug-tsan-compile + display_name: "* TSAN Enterprise RHEL 8.8 DEBUG Compile" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-large + - rhel8.8-large stepback: false - expansions: &enterprise-rhel80-debug-tsan-expansions-template + expansions: &enterprise-rhel88-debug-tsan-expansions-template additional_package_targets: >- archive-mongocryptd archive-mongocryptd-debug lang_environment: LANG=C toolchain_version: stable - compile_variant: *enterprise-rhel80-debug-tsan-compile + compile_variant: *enterprise-rhel88-debug-tsan-compile # If you add anything to san_options, make sure the appropriate # changes are also made to SConstruct. # @@ -404,9 +404,9 @@ buildvariants: resmoke_jobs_factor: 0.3 scons_cache_scope: shared separate_debug: off - large_distro_name: &enterprise-rhel80-debug-tsan-large-distro-name rhel80-xlarge - xlarge_distro_name: rhel80-xxlarge - core_analyzer_distro_name: rhel80-xxlarge + large_distro_name: &enterprise-rhel88-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_edition: enterprise test_flags: >- @@ -423,22 +423,22 @@ buildvariants: - name: .release_critical .requires_compile_variant !.requires_large_host_tsan !.incompatible_development_variant !.incompatible_tsan - name: .release_critical .requires_compile_variant .requires_large_host_tsan !.incompatible_development_variant !.incompatible_tsan distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .default .requires_compile_variant !.requires_large_host_tsan !.incompatible_development_variant !.incompatible_tsan - name: .default .requires_compile_variant .requires_large_host_tsan !.incompatible_development_variant !.incompatible_tsan distros: - - rhel80-xlarge + - rhel8.8-xlarge - - <<: *enterprise-rhel80-debug-tsan-template - name: &enterprise-rhel80-debug-tsan enterprise-rhel80-debug-tsan - display_name: "* TSAN Enterprise RHEL 8.0 DEBUG" + - <<: *enterprise-rhel88-debug-tsan-template + name: &enterprise-rhel88-debug-tsan enterprise-rhel88-debug-tsan + display_name: "* TSAN Enterprise RHEL 8.8 DEBUG" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. depends_on: - name: archive_dist_test_debug - variant: *enterprise-rhel80-debug-tsan-compile + variant: *enterprise-rhel88-debug-tsan-compile - name: archive_jstestshell - variant: *enterprise-rhel80-debug-tsan-compile + variant: *enterprise-rhel88-debug-tsan-compile - name: version_gen variant: generate-tasks-for-version # This is added because of EVG-18211. @@ -448,39 +448,39 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.requires_large_host_tsan !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .development_critical .requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .release_critical !.requires_large_host !.requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .release_critical .requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .default !.requires_large_host !.requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .default .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .default .requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .non_deterministic !.requires_large_host !.requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags - name: .non_deterministic .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - name: .non_deterministic .requires_large_host_tsan !.requires_compile_variant !.incompatible_development_variant !.incompatible_tsan !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel80-debug-tsan-large-distro-name + - *enterprise-rhel88-debug-tsan-large-distro-name - <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-classic-engine rhel80-debug-aubsan-classic-engine - display_name: "* {A,UB}SAN Enterprise RHEL 8.0 DEBUG (Classic Engine)" + name: &rhel88-debug-aubsan-classic-engine rhel88-debug-aubsan-classic-engine + display_name: "* {A,UB}SAN Enterprise RHEL 8.8 DEBUG (Classic Engine)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions test_flags: >- 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 5da2ebca9d8..ce216665797 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 @@ -62,8 +62,8 @@ variables: multiversion_platform: rhel80 multiversion_edition: enterprise repo_edition: enterprise - large_distro_name: rhel80-medium - core_analyzer_distro_name: rhel80-xlarge + large_distro_name: rhel8.8-medium + core_analyzer_distro_name: rhel8.8-xlarge num_scons_link_jobs_available: 0.99 compile_variant: *linux_x86_dynamic_compile_variant_name @@ -72,7 +72,7 @@ variables: # - etc/evergreen_yml_components/variants/rhel/test_dev.yml # - etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - - &enterprise-rhel-80-64-bit-dynamic-expansions + - &enterprise-rhel-88-64-bit-dynamic-expansions <<: *linux_x86_generic_expansions scons_cache_scope: shared scons_cache_mode: all @@ -83,7 +83,7 @@ variables: max_sub_suites: 5 idle_timeout_factor: 1.5 exec_timeout_factor: 1.5 - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium # If you add anything to san_options, make sure the appropriate changes are # also made to SConstruct. @@ -116,8 +116,8 @@ variables: hang_analyzer_dump_core: false max_sub_suites: 3 num_scons_link_jobs_available: 0.99 - large_distro_name: rhel80-build - xlarge_distro_name: rhel80-xxlarge + large_distro_name: rhel8.8-large + xlarge_distro_name: rhel8.8-xxlarge multiversion_platform: rhel80 multiversion_edition: enterprise gcov_tool: /opt/mongodbtoolchain/v4/bin/gcov @@ -127,21 +127,21 @@ buildvariants: # Redhat buildvariants # ########################################### - - name: &enterprise-rhel-80-64-bit-dynamic-debug-mode enterprise-rhel-80-64-bit-dynamic-debug-mode - display_name: "Shared Library Enterprise RHEL 8.0 Debug Mode" + - name: &enterprise-rhel-88-64-bit-dynamic-debug-mode enterprise-rhel-88-64-bit-dynamic-debug-mode + display_name: "Shared Library Enterprise RHEL 8.8 Debug Mode" tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - - rhel80-small + - rhel8.8-small stepback: false expansions: - <<: *enterprise-rhel-80-64-bit-dynamic-expansions - compile_variant: *enterprise-rhel-80-64-bit-dynamic-debug-mode + <<: *enterprise-rhel-88-64-bit-dynamic-expansions + compile_variant: *enterprise-rhel-88-64-bit-dynamic-debug-mode test_flags: >- --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" compile_flags: >- --ssl - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars --link-model=dynamic @@ -151,52 +151,52 @@ buildvariants: --use-diagnostic-latches=on exec_timeout_secs: 32400 # 9 hour timeout timeout_secs: 18000 # 5 hour idle timeout - large_distro_name: &enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name rhel80-xlarge + large_distro_name: &enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name rhel8.8-xlarge depends_on: [] tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: compile_integration_and_test_parallel_stream_TG distros: - - rhel80-large + - rhel8.8-large - name: crypt_build_debug_and_test distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .development_critical !.requires_large_host !.requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags - name: .development_critical .requires_large_host !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .development_critical .requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .release_critical !.requires_large_host !.requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags - name: .release_critical .requires_large_host !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .release_critical .requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .default !.requires_large_host !.requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags - name: .default .requires_large_host !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .default .requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .non_deterministic !.requires_large_host !.requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags - name: .non_deterministic .requires_large_host !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name - name: .non_deterministic .requires_large_host_debug_mode !.incompatible_development_variant !.incompatible_debug_mode !.incompatible_system_allocator !.requires_all_feature_flags distros: - - *enterprise-rhel-80-64-bit-dynamic-debug-mode-large-distro-name + - *enterprise-rhel-88-64-bit-dynamic-debug-mode-large-distro-name ########################################### # Windows buildvariants # @@ -373,13 +373,13 @@ buildvariants: # Experimental buildvariants # ########################################### - - &rhel80-debug-ubsan-all-feature-flags-template - name: &rhel80-debug-ubsan-all-feature-flags rhel80-debug-ubsan-all-feature-flags - display_name: "* Shared Library UBSAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + - &rhel88-debug-ubsan-all-feature-flags-template + name: &rhel88-debug-ubsan-all-feature-flags rhel88-debug-ubsan-all-feature-flags + display_name: "* Shared Library UBSAN Enterprise RHEL 8.8 DEBUG (all feature flags)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large stepback: false expansions: toolchain_version: stable @@ -397,7 +397,7 @@ buildvariants: --allocator=tcmalloc-gperf -j$(grep -c ^processor /proc/cpuinfo) --use-diagnostic-latches=on - compile_variant: *rhel80-debug-ubsan-all-feature-flags + compile_variant: *rhel88-debug-ubsan-all-feature-flags # To force disable feature flags even on the all feature flags variant, please use this file: # buildscripts/resmokeconfig/fully_disabled_feature_flags.yml test_flags: >- @@ -409,7 +409,7 @@ buildvariants: resmoke_jobs_factor: 0.3 # Avoid starting too many mongod's under UBSAN build. scons_cache_scope: shared separate_debug: off - large_distro_name: rhel80-build + large_distro_name: rhel8.8-large tasks: - name: compile_and_archive_dist_test_TG - name: .concurrency !.no_txns !.repl !.kill_terminate @@ -417,12 +417,12 @@ buildvariants: - name: generate_buildid_to_debug_symbols_mapping - <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-all-feature-flags rhel80-debug-aubsan-all-feature-flags - display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + name: &rhel88-debug-aubsan-all-feature-flags rhel88-debug-aubsan-all-feature-flags + display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.8 DEBUG (all feature flags)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions # To force disable feature flags even on the all feature flags variant, please use this file: @@ -435,27 +435,27 @@ buildvariants: - name: .development_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags - name: .development_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .release_critical !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags - name: .release_critical .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .default !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags - name: .default .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - name: .non_deterministic !.requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags - name: .non_deterministic .requires_large_host !.requires_compile_variant !.incompatible_development_variant !.incompatible_aubsan !.incompatible_system_allocator !.incompatible_all_feature_flags distros: - - rhel80-large + - rhel8.8-large - <<: *linux_debug_aubsan_compile_variant_dependency - name: &rhel80-debug-aubsan-experimental-all-feature-flags rhel80-debug-aubsan-experimental-all-feature-flags - display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG Experimental (all feature flags)" + name: &rhel88-debug-aubsan-experimental-all-feature-flags rhel88-debug-aubsan-experimental-all-feature-flags + display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.8 DEBUG Experimental (all feature flags)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *aubsan-lite-required-expansions # To force disable feature flags even on the all feature flags variant, please use this file: @@ -470,12 +470,12 @@ buildvariants: - name: .random_multiversion_ds - name: .watchdog - - name: &rhel80-debug-aubsan-benchmarks rhel80-debug-aubsan-benchmarks - display_name: "* {A,UB}SAN Enterprise RHEL 8.0 DEBUG (Benchmarks)" + - name: &rhel88-debug-aubsan-benchmarks rhel88-debug-aubsan-benchmarks + display_name: "* {A,UB}SAN Enterprise RHEL 8.8 DEBUG (Benchmarks)" tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - - rhel80-build + - rhel8.8-large expansions: <<: *generic_linux_compile_expansions separate_debug: off @@ -494,20 +494,20 @@ buildvariants: --benchmarkRepetitions=1 --excludeWithAnyTags=incompatible_aubsan --mongodSetParameters="{internalQueryEnableAggressiveSpillsInGroup: true}" - compile_variant: *rhel80-debug-aubsan-benchmarks + compile_variant: *rhel88-debug-aubsan-benchmarks tasks: - name: compile_upload_benchmarks_TG distros: - - rhel80-xlarge + - rhel8.8-xlarge - name: .benchmarks - - name: &enterprise-rhel80-unoptimized-64-bit enterprise-rhel80-unoptimized-64-bit - display_name: "~ Enterprise RHEL 8.0 DEBUG (Unoptimized)" + - name: &enterprise-rhel88-unoptimized-64-bit enterprise-rhel88-unoptimized-64-bit + display_name: "~ Enterprise RHEL 8.8 DEBUG (Unoptimized)" tags: ["bazel_check"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: compile_flags: >- - MONGO_DISTMOD=rhel80 + MONGO_DISTMOD=rhel88 -j$(grep -c ^processor /proc/cpuinfo) --dbg=on --opt=off @@ -519,17 +519,17 @@ buildvariants: scons_cache_mode: all scons_cache_scope: shared num_scons_link_jobs_available: 0.99 - compile_variant: *enterprise-rhel80-unoptimized-64-bit + compile_variant: *enterprise-rhel88-unoptimized-64-bit tasks: - name: compile_test_parallel_core_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_unittest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: compile_test_parallel_dbtest_stream_TG distros: - - rhel80-build + - rhel8.8-large - name: generate_buildid_to_debug_symbols_mapping distros: - - rhel80-build + - rhel8.8-large diff --git a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml index e79fa7ba771..79cbece4388 100644 --- a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml @@ -12,7 +12,7 @@ variables: # ANY MODIFICATIONS HERE SHOULD ALSO BE MADE IN THOSE FILES - &generic_linux_compile_params # Essential set of compile parameters used for Linux dev variants. run_on: - - rhel80-xlarge + - rhel8.8-xlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. tasks: - name: compile_test_parallel_core_stream_TG @@ -66,7 +66,7 @@ buildvariants: tags: [] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - - rhel80-medium + - rhel8.8-medium modules: - wtdevelop depends_on: @@ -80,7 +80,7 @@ buildvariants: expansions: use_wt_develop: true resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's - large_distro_name: rhel80-medium + large_distro_name: rhel8.8-medium max_sub_suites: "5" target_resmoke_time: "15" compile_flags: >- diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml index e9c9afce942..f6153602bc5 100644 --- a/etc/generate_subtasks_config.yml +++ b/etc/generate_subtasks_config.yml @@ -14,10 +14,10 @@ build_variant_large_distro_exceptions: - enterprise-linux-64-amazon-ami - enterprise-macos - enterprise-macos-arm64 - - enterprise-rhel-80-64-bit - - enterprise-rhel-80-64-bit-coverage + - enterprise-rhel-88-64-bit + - enterprise-rhel-88-64-bit-coverage - enterprise-rhel-81-ppc64le - - enterprise-rhel-82-arm64 + - enterprise-rhel-88-arm64 - enterprise-rhel-83-s390x - enterprise-rhel-90-64-bit - enterprise-rhel-90-arm64 @@ -27,23 +27,23 @@ build_variant_large_distro_exceptions: - enterprise-ubuntu1804-s390x - enterprise-ubuntu2004-arm64 - enterprise-ubuntu2204-arm64 - - hot_backups-rhel-80-64-bit + - hot_backups-rhel-88-64-bit - linux-debug-aubsan-compile-required - linux-x86-dynamic-compile - linux-x86-dynamic-debug-compile-required - macos - macos-arm64 - macos-debug-suggested - - rhel80 - - rhel80-debug-asan - - rhel80-debug-asan-all-feature-flags - - rhel80-debug-asan-classic-engine - - rhel80-debug-aubsan-lite - - rhel80-debug-suggested - - rhel80-debug-ubsan - - rhel80-debug-ubsan-all-feature-flags - - rhel80-debug-ubsan-classic-engine - - rhel-82-arm64 + - rhel88 + - rhel88-debug-asan + - rhel88-debug-asan-all-feature-flags + - rhel88-debug-asan-classic-engine + - rhel88-debug-aubsan-lite + - rhel88-debug-suggested + - rhel88-debug-ubsan + - rhel88-debug-ubsan-all-feature-flags + - rhel88-debug-ubsan-classic-engine + - rhel-88-arm64 - rhel93 - rhel93-arm64 - suse15 diff --git a/etc/olsen_time_zones.yml b/etc/olsen_time_zones.yml index 09dd25de20a..a130f5a8e79 100644 --- a/etc/olsen_time_zones.yml +++ b/etc/olsen_time_zones.yml @@ -34,6 +34,6 @@ buildvariants: - name: linux-64 display_name: Linux run_on: - - rhel80-small + - rhel8.8-small tasks: - name: compile diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index d4ec9d394a2..87594032341 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -27,7 +27,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then # Use the RHEL 8 all feature flags variant for the classic engine variant. The original # classic engine variant is not a required builder and therefore not captured in patch # test failure history. - tags_build_variant="enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required" + tags_build_variant="enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required" fi $python buildscripts/testmatrix/getdisplaytaskname.py "${task_name}" "${build_variant}" > display_task_name.txt @@ -105,7 +105,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-88-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 dfffd5e7d43..0ab3421a75d 100644 --- a/rpm/mongodb-enterprise-init.spec +++ b/rpm/mongodb-enterprise-init.spec @@ -243,7 +243,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 fd202901dd3..6ff0a5fb98a 100644 --- a/rpm/mongodb-enterprise-unstable-init.spec +++ b/rpm/mongodb-enterprise-unstable-init.spec @@ -234,7 +234,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 86fca6cdbb1..3a367cc93f8 100644 --- a/rpm/mongodb-enterprise-unstable.spec +++ b/rpm/mongodb-enterprise-unstable.spec @@ -241,7 +241,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 9c8cf0ac17c..c5e2d550ebc 100644 --- a/rpm/mongodb-enterprise.spec +++ b/rpm/mongodb-enterprise.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 diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec index 867d35a31f9..92b17e2db37 100644 --- a/rpm/mongodb-org-init.spec +++ b/rpm/mongodb-org-init.spec @@ -220,7 +220,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 7d867029dd0..626c3d1dd76 100644 --- a/rpm/mongodb-org-unstable-init.spec +++ b/rpm/mongodb-org-unstable-init.spec @@ -209,7 +209,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 23bea0f2e46..cbd76a73635 100644 --- a/rpm/mongodb-org-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -216,7 +216,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 94becab0674..22ef07d95ff 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -227,7 +227,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