SERVER-87451 Upgrade rhel8.0 variants to rhel8.8 (#24255)

GitOrigin-RevId: 207f40cabcfc5ca67232a3b1c22eea7c4a6ea022

Author: zackwintermdb

buildscripts/evergreen_gen_build_metrics_tasks.py

@@ -192,16 +192,16 @@ def create_task_group(target_platform, tasks):
     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():

buildscripts/evergreen_resmoke_job_count.py

@@ -30,18 +30,18 @@
 
 # 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 @@
 
 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 = {

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

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)

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
 """
 

buildscripts/tests/util/test_taskname.py

@@ -30,23 +30,23 @@ def test_doesnt_remove_non_gen_suffix(self):
 
 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)
 
         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)
 
         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)

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",)

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:
 

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

etc/evergreen_timeouts.yml

@@ -34,15 +34,15 @@ 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
       exec_timeout: 240 # 4 hours
     - 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,15 +140,15 @@ 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
       exec_timeout: 300 # 5 hours
     - 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
 

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

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

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

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,24 +189,24 @@ 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
       has_packages: false
     tasks:
       - name: compile_ninja_next_TG
         distros:
-          - rhel80-xlarge
+          - rhel8.8-xlarge
       - name: compile_ninja_TG
         distros:
-          - rhel80-xlarge
+          - rhel8.8-xlarge

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

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