Skip to content

Commit d31d9e6

Browse files
zackwintermdbMongoDB Bot
zackwintermdb
authored and
MongoDB Bot
committed
SERVER-92375 Remove minor version from rhel8.x variant names (#24673)
GitOrigin-RevId: 2fd8933415258db907ad715223bde85e9986b6a2
1 parent a1f61b4 commit d31d9e6

23 files changed

+249
-259
lines changed

Diff for: ‎buildscripts/evergreen_gen_build_metrics_tasks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def create_task_group(target_platform, tasks):
192192
else:
193193
if platform.machine() == "x86_64":
194194
variant = BuildVariant(
195-
name="enterprise-rhel-88-64-bit-build-metrics",
195+
name="enterprise-rhel-8-64-bit-build-metrics",
196196
activate=True,
197197
)
198198
for link_model, tasks in tasks["linux_x86_64_tasks"].items():
@@ -201,7 +201,7 @@ def create_task_group(target_platform, tasks):
201201
)
202202
else:
203203
variant = BuildVariant(
204-
name="enterprise-rhel-88-aarch64-build-metrics",
204+
name="enterprise-rhel-8-aarch64-build-metrics",
205205
activate=True,
206206
)
207207
for link_model, tasks in tasks["linux_arm64_tasks"].items():

Diff for: ‎buildscripts/evergreen_resmoke_job_count.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030

3131
# Apply factor for a task based on the build variant it is running on.
3232
VARIANT_TASK_FACTOR_OVERRIDES = {
33-
"enterprise-rhel-88-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
34-
"enterprise-rhel-88-64-bit-inmem": [
33+
"enterprise-rhel-8-64-bit": [{"task": r"logical_session_cache_replication.*", "factor": 0.75}],
34+
"enterprise-rhel-8-64-bit-inmem": [
3535
{"task": "secondary_reads_passthrough", "factor": 0.3},
3636
{"task": "multi_stmt_txn_jscore_passthrough_with_migration", "factor": 0.3},
3737
],
38-
"enterprise-rhel88-debug-tsan": [
38+
"enterprise-rhel8-debug-tsan": [
3939
{"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.125}
4040
],
41-
"rhel88-debug-aubsan-classic-engine": [
41+
"rhel8-debug-aubsan-classic-engine": [
4242
{"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.25}
4343
],
44-
"rhel88-debug-aubsan-all-feature-flags": [
44+
"rhel8-debug-aubsan-all-feature-flags": [
4545
{"task": r"shard.*uninitialized_fcv_jscore_passthrough.*", "factor": 0.25}
4646
],
4747
"enterprise-windows-all-feature-flags-required": [{"task": "noPassthrough", "factor": 0.5}],

Diff for: ‎buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml

+8-18
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,14 @@ evergreen_buildvariants:
110110
platform: rhel79
111111
architecture: x86_64
112112

113-
- name: rhel80
113+
- name: rhel8
114114
edition: targeted
115-
platform: rhel80
115+
platform: rhel8
116116
architecture: x86_64
117117

118-
- name: rhel88
119-
edition: targeted
120-
platform: rhel88
121-
architecture: x86_64
122-
123-
- name: enterprise-rhel-80-64-bit
124-
edition: enterprise
125-
platform: rhel80
126-
architecture: x86_64
127-
128-
- name: enterprise-rhel-88-64-bit
118+
- name: enterprise-rhel-8-64-bit
129119
edition: enterprise
130-
platform: rhel88
120+
platform: rhel8
131121
architecture: x86_64
132122

133123
- name: rhel-82-arm64
@@ -140,14 +130,14 @@ evergreen_buildvariants:
140130
platform: rhel82
141131
architecture: arm64
142132

143-
- name: rhel-88-arm64
133+
- name: rhel-8-arm64
144134
edition: targeted
145-
platform: rhel88
135+
platform: rhel8
146136
architecture: arm64
147137

148-
- name: enterprise-rhel-88-arm64
138+
- name: enterprise-rhel-8-arm64
149139
edition: enterprise
150-
platform: rhel88
140+
platform: rhel8
151141
architecture: arm64
152142

153143
- name: enterprise-rhel-71-ppc64le

Diff for: ‎buildscripts/resmokelib/utils/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def get_task_name_without_suffix(task_name, variant_name):
8787
"""Return evergreen task name without suffix added to the generated task.
8888
8989
Remove evergreen variant name, numerical suffix and underscores between them from evergreen task name.
90-
Example: "noPassthrough_0_enterprise-rhel-88-64-bit-dynamic-required" -> "noPassthrough"
90+
Example: "noPassthrough_0_enterprise-rhel-8-64-bit-dynamic-required" -> "noPassthrough"
9191
"""
9292
task_name = task_name if task_name else ""
9393
return re.sub(rf"(_[0-9]+)?(_{variant_name})?$", "", task_name)

Diff for: ‎buildscripts/testmatrix/getdisplaytaskname.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
Get the display task name from the execution task and the variant.
33
4-
Get an execution task name like this: multiversion_auth_0_enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required
4+
Get an execution task name like this: multiversion_auth_0_enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required
55
Into a display task name like this: multiversion_auth
66
"""
77

Diff for: ‎buildscripts/tests/util/test_taskname.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ def test_doesnt_remove_non_gen_suffix(self):
3030

3131
class TestDetermineTaskBaseName(unittest.TestCase):
3232
def test_task_name_with_build_variant_should_strip_bv_and_sub_task_index(self):
33-
bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required"
33+
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
3434
task_name = f"auth_23_{bv}"
3535

3636
base_task_name = under_test.determine_task_base_name(task_name, bv)
3737

3838
self.assertEqual("auth", base_task_name)
3939

4040
def test_task_name_without_build_variant_should_strip_sub_task_index(self):
41-
bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required"
41+
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
4242
task_name = "auth_314"
4343

4444
base_task_name = under_test.determine_task_base_name(task_name, bv)
4545

4646
self.assertEqual("auth", base_task_name)
4747

4848
def test_task_name_without_build_variant_or_subtask_index_should_self(self):
49-
bv = "enterprise-rhel-88-64-bit-dynamic-all-feature-flags-required"
49+
bv = "enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required"
5050
task_name = "auth"
5151

5252
base_task_name = under_test.determine_task_base_name(task_name, bv)

Diff for: ‎docs/branching/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The reason they should be pushed as separate commits is in the case of needing t
5959
- Build variant names:
6060

6161
- `enterprise-windows-all-feature-flags-required`
62-
- `rhel88-debug-aubsan-lite-all-feature-flags-required`
62+
- `rhel8-debug-aubsan-lite-all-feature-flags-required`
6363

6464
- Actions:
6565

Diff for: ‎docs/evergreen-testing/burn_in_tags.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variants, `burn_in_tags` runs them on the burn_in build variants that are genera
1111
## How to use it
1212

1313
You can use `burn_in_tags` on evergreen by selecting the `burn_in_tags_gen` task when creating a patch.
14-
The burn_in build variants, i.e., `enterprise-rhel-88-64-bit-inmem` and `enterprise-rhel-88-64-bit-multiversion`
14+
The burn_in build variants, i.e., `enterprise-rhel-8-64-bit-inmem` and `enterprise-rhel-8-64-bit-multiversion`
1515
will be generated, each of which will have a `burn_in_tests` task generated by the
1616
[mongo-task-generator](https://github.com/mongodb/mongo-task-generator). `burn_in_tests` task, a
1717
[generated task](task_generation.md), may have multiple sub-tasks which run the test suites only for the

Diff for: ‎etc/evergreen_timeouts.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ overrides:
3434
- task: replica_sets_jscore_passthrough
3535
exec_timeout: 150 # 2.5 hours
3636

37-
enterprise-rhel-88-64-bit-dynamic-all-feature-flags:
37+
enterprise-rhel-8-64-bit-dynamic-all-feature-flags:
3838
- task: cursor_hints_to_query_settings_replset_passthrough
3939
exec_timeout: 240 # 4 hours
4040
- task: cursor_hints_to_query_settings_sharded_collections_passthrough
4141
exec_timeout: 240 # 4 hours
4242
- task: cursor_hints_to_query_settings_unsharded_collections_passthrough
4343
exec_timeout: 240 # 4 hours
4444

45-
enterprise-rhel88-debug-tsan:
45+
enterprise-rhel8-debug-tsan:
4646
- task: aggregation_expression_multiversion_fuzzer
4747
exec_timeout: 600 # 10 hours
4848
- task: aggregation_multiversion_fuzzer
@@ -114,7 +114,7 @@ overrides:
114114
- task: replica_sets_jscore_passthrough
115115
exec_timeout: 150 # 2.5 hours
116116

117-
rhel88-asan:
117+
rhel8-asan:
118118
- task: aggregation_timeseries_fuzzer
119119
exec_timeout: 360 # 6 hours
120120
- task: aggregation_blockprocessing_fuzzer
@@ -126,11 +126,11 @@ overrides:
126126
- task: aggregation_multiversion_fuzzer_last_lts
127127
exec_timeout: 300 # 5 hours
128128

129-
rhel88-debug-ubsan-classic-engine:
129+
rhel8-debug-ubsan-classic-engine:
130130
- task: update_timeseries_fuzzer
131131
exec_timeout: 150 # 2.5 hours
132132

133-
rhel88-debug-aubsan-all-feature-flags:
133+
rhel8-debug-aubsan-all-feature-flags:
134134
- task: update_timeseries_fuzzer
135135
exec_timeout: 180 # 3 hours
136136
- task: change_stream_serverless_no_optimization_fuzzer
@@ -140,15 +140,15 @@ overrides:
140140
- task: change_stream_optimization_fuzzer
141141
exec_timeout: 300 # 5 hours
142142

143-
rhel88-debug-aubsan:
143+
rhel8-debug-aubsan:
144144
- task: change_stream_serverless_no_optimization_fuzzer
145145
exec_timeout: 300 # 5 hours
146146
- task: change_stream_serverless_fuzzer
147147
exec_timeout: 300 # 5 hours
148148
- task: change_stream_optimization_fuzzer
149149
exec_timeout: 300 # 5 hours
150150

151-
rhel88-debug-aubsan-classic-engine:
151+
rhel8-debug-aubsan-classic-engine:
152152
- task: update_timeseries_fuzzer
153153
exec_timeout: 180 # 3 hours
154154

Diff for: ‎etc/evergreen_yml_components/definitions.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ variables:
2424
- enterprise-debian12-64
2525
- enterprise-rhel-81-ppc64le
2626
- ubi8
27-
- rhel88
28-
- rhel-88-arm64
27+
- rhel8
28+
- rhel-8-arm64
2929
- rhel93
3030
- rhel93-arm64
31-
- enterprise-rhel-88-64-bit
32-
- enterprise-rhel-88-64-bit-suggested # For testing selinux.
33-
- enterprise-rhel-88-arm64
31+
- enterprise-rhel-8-64-bit
32+
- enterprise-rhel-8-64-bit-suggested # For testing selinux.
33+
- enterprise-rhel-8-arm64
3434
- enterprise-rhel-83-s390x
3535
- enterprise-rhel-93-64-bit
3636
- enterprise-rhel-93-arm64

Diff for: ‎etc/evergreen_yml_components/tasks/compile_tasks.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ variables:
147147
- enterprise-macos
148148
- enterprise-macos-arm64
149149
- enterprise-rhel-81-ppc64le
150-
- enterprise-rhel-88-64-bit
151-
- enterprise-rhel-88-64-bit-coverage
152-
- enterprise-rhel-88-64-bit-suggested
153-
- enterprise-rhel-88-arm64
150+
- enterprise-rhel-8-64-bit
151+
- enterprise-rhel-8-64-bit-coverage
152+
- enterprise-rhel-8-64-bit-suggested
153+
- enterprise-rhel-8-arm64
154154
- enterprise-rhel-83-s390x
155155
- enterprise-rhel-90-64-bit
156156
- enterprise-rhel-90-arm64

Diff for: ‎etc/evergreen_yml_components/tasks/misc_tasks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ tasks:
13701370
- func: "extract binaries"
13711371
- func: "run selinux tests"
13721372
vars:
1373-
distro: rhel80-selinux
1373+
distro: rhel8.8-selinux
13741374
test_list: jstests/selinux/*.js src/mongo/db/modules/enterprise/jstests/selinux/*.js
13751375

13761376
- name: selinux_rhel8_org
@@ -1388,7 +1388,7 @@ tasks:
13881388
- func: "extract binaries"
13891389
- func: "run selinux tests"
13901390
vars:
1391-
distro: rhel80-selinux
1391+
distro: rhel8.8-selinux
13921392
test_list: jstests/selinux/*.js
13931393

13941394
- name: selinux_rhel9_enterprise

Diff for: ‎etc/evergreen_yml_components/variants/misc/misc.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ buildvariants:
1717
burn_in_tag_include_all_required_and_suggested: true
1818
burn_in_tag_exclude_build_variants: >-
1919
macos-debug-suggested
20-
enterprise-rhel-88-64-bit-dynamic-embedded-router
20+
enterprise-rhel-8-64-bit-dynamic-embedded-router
2121
burn_in_tag_include_build_variants: >-
22-
enterprise-rhel-88-64-bit-inmem
23-
enterprise-rhel-88-64-bit-multiversion
22+
enterprise-rhel-8-64-bit-inmem
23+
enterprise-rhel-8-64-bit-multiversion
2424
amazon-linux2-arm64-try-sbe-engine
2525
burn_in_tag_compile_task_dependency: archive_dist_test_debug
2626
compile_variant: &amazon_linux2_arm64_dynamic_compile_variant_name amazon-linux2-arm64-dynamic-compile
@@ -189,8 +189,8 @@ buildvariants:
189189
tasks:
190190
- name: compile_ninja_fast_icecc_TG
191191

192-
- name: enterprise-rhel-88-64-bit-dynamic-ninja
193-
display_name: "Ninja Build: Enterprise RHEL 8.8"
192+
- name: enterprise-rhel-8-64-bit-dynamic-ninja
193+
display_name: "Ninja Build: Enterprise RHEL 8"
194194
tags: []
195195
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
196196
run_on:

Diff for: ‎etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildvariants:
1212
run_on:
1313
- rhel8.8-small
1414
expansions:
15-
multiversion_platform: rhel80
15+
multiversion_platform: rhel8
1616
multiversion_edition: enterprise
1717
compile_variant: *stm-daily-cron
1818
stepback: false

Diff for: ‎etc/evergreen_yml_components/variants/mongot/test_dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -236,28 +236,28 @@ buildvariants:
236236

237237
# This RHEL variant runs search integration tests against latest/HEAD of 10gen/mongot. It is not
238238
# configured with any project trigger on mongot.
239-
- name: &enterprise-rhel-80-64-mongot-integration enterprise-rhel-80-64-mongot-integration
240-
display_name: "Enterprise RHEL 8.0 Mongot Integration"
239+
- name: &enterprise-rhel-8-64-mongot-integration enterprise-rhel-8-64-mongot-integration
240+
display_name: "Enterprise RHEL 8 Mongot Integration"
241241
cron: "0 */4 * * *" # Run these tasks every 4 hours
242242
run_on:
243-
- rhel80-medium
243+
- rhel8.8-medium
244244
tags: []
245245
expansions:
246246
scons_cache_scope: shared
247247
scons_cache_mode: all
248-
compile_variant: *enterprise-rhel-80-64-mongot-integration
248+
compile_variant: *enterprise-rhel-8-64-mongot-integration
249249
has_packages: false
250250
build_mongot: true
251251
compile_flags: >-
252252
--ssl
253-
MONGO_DISTMOD=rhel80
253+
MONGO_DISTMOD=rhel88
254254
-j$(grep -c ^processor /proc/cpuinfo)
255255
--variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
256256
--link-model=dynamic
257257
--use-diagnostic-latches=on
258258
tasks:
259259
- name: compile_and_archive_dist_test_TG
260260
distros:
261-
- rhel80-large
261+
- rhel8.8-large
262262
- name: search_end_to_end_sharded_cluster
263263
- name: search_end_to_end_single_node

0 commit comments

Comments
 (0)