Skip to content

Commit b67d4ef

Browse files
baileympearsonbaileympearson
committed
upgrade to rhel9, for glibc 2.29+
1 parent cf9baec commit b67d4ef

File tree

3 files changed

+37
-38
lines changed

3 files changed

+37
-38
lines changed

‎.evergreen/ci_matrix_constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const TLS_VERSIONS = ['latest', '8.0', '7.0', '6.0', '5.0', '4.4', '4.2'];
1313
const LB_VERSIONS = MONGODB_VERSIONS.slice(0, MONGODB_VERSIONS.indexOf('5.0') + 1);
1414
LB_VERSIONS.reverse();
1515

16-
const DEFAULT_OS = 'rhel80-large';
16+
const DEFAULT_OS = 'rhel90-large';
1717
const WINDOWS_OS = 'windows-vsCurrent-large';
1818
const MACOS_OS = 'macos-14-arm64';
1919
const UBUNTU_OS = 'ubuntu1804-large';

‎.evergreen/config.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2867,9 +2867,9 @@ buildvariants:
28672867
run_on: ubuntu2204-small
28682868
tasks:
28692869
- .alpine-fle
2870-
- name: rhel80-large-iron
2871-
display_name: rhel8 Node20.19.0
2872-
run_on: rhel80-large
2870+
- name: rhel90-large-iron
2871+
display_name: rhel9 Node20.19.0
2872+
run_on: rhel90-large
28732873
expansions:
28742874
NODE_LTS_VERSION: 20.19.0
28752875
CLIENT_ENCRYPTION: 'true'
@@ -2922,9 +2922,9 @@ buildvariants:
29222922
- test-tls-support-5.0
29232923
- test-tls-support-4.4
29242924
- test-tls-support-4.2
2925-
- name: rhel80-large-Node22
2926-
display_name: rhel8 Node22
2927-
run_on: rhel80-large
2925+
- name: rhel90-large-Node22
2926+
display_name: rhel9 Node22
2927+
run_on: rhel90-large
29282928
expansions:
29292929
NODE_LTS_VERSION: 22
29302930
CLIENT_ENCRYPTION: 'true'
@@ -2977,9 +2977,9 @@ buildvariants:
29772977
- test-tls-support-5.0
29782978
- test-tls-support-4.4
29792979
- test-tls-support-4.2
2980-
- name: rhel80-large-node-latest
2981-
display_name: rhel8 Node Latest
2982-
run_on: rhel80-large
2980+
- name: rhel90-large-node-latest
2981+
display_name: rhel9 Node Latest
2982+
run_on: rhel90-large
29832983
expansions:
29842984
NODE_LTS_VERSION: latest
29852985
CLIENT_ENCRYPTION: true
@@ -3120,9 +3120,9 @@ buildvariants:
31203120
- test-tls-support-5.0
31213121
- test-tls-support-4.4
31223122
- test-tls-support-4.2
3123-
- name: rhel8-node20.19.0-test-csfle-mongocryptd
3123+
- name: rhel9-node20.19.0-test-csfle-mongocryptd
31243124
display_name: rhel 8 Node20.19.0 test mongocryptd
3125-
run_on: rhel80-large
3125+
run_on: rhel90-large
31263126
expansions:
31273127
CLIENT_ENCRYPTION: true
31283128
RUN_WITH_MONGOCRYPTD: true
@@ -3136,9 +3136,9 @@ buildvariants:
31363136
- test-5.0-csfle-mongocryptd
31373137
- test-4.4-csfle-mongocryptd
31383138
- test-4.2-csfle-mongocryptd
3139-
- name: rhel8-node22-test-csfle-mongocryptd
3139+
- name: rhel9-node22-test-csfle-mongocryptd
31403140
display_name: rhel 8 Node22 test mongocryptd
3141-
run_on: rhel80-large
3141+
run_on: rhel90-large
31423142
expansions:
31433143
CLIENT_ENCRYPTION: true
31443144
RUN_WITH_MONGOCRYPTD: true
@@ -3162,14 +3162,14 @@ buildvariants:
31623162
- test-rapid-server
31633163
- name: lint
31643164
display_name: lint
3165-
run_on: rhel80-large
3165+
run_on: rhel90-large
31663166
tasks:
31673167
- .unit-tests
31683168
- .lint-checks
31693169
- .typescript-compilation
31703170
- name: generate-combined-coverage
31713171
display_name: Generate Combined Coverage
3172-
run_on: rhel80-large
3172+
run_on: rhel90-large
31733173
tasks:
31743174
- download-and-merge-coverage
31753175
- name: ubuntu2004-test-mongodb-aws
@@ -3198,15 +3198,15 @@ buildvariants:
31983198
tags:
31993199
- performance
32003200
activate: true
3201-
- name: rhel8-custom-dependency-tests
3201+
- name: rhel9-custom-dependency-tests
32023202
display_name: Custom Dependency Version Test
3203-
run_on: rhel80-large
3203+
run_on: rhel90-large
32043204
tasks:
32053205
- run-custom-csfle-tests-5.0
32063206
- run-custom-csfle-tests-rapid
32073207
- run-custom-csfle-tests-latest
32083208
- test-latest-driver-mongodb-client-encryption-6.0.0
3209-
- name: rhel8-test-gcp-kms
3209+
- name: debian11-small-test-gcp-kms
32103210
display_name: GCP KMS Test
32113211
run_on: debian11-small
32123212
tasks:
@@ -3231,14 +3231,14 @@ buildvariants:
32313231
- testk8soidc_task_group_eks
32323232
- testk8soidc_task_group_gke
32333233
- testk8soidc_task_group_aks
3234-
- name: rhel8-test-atlas
3234+
- name: rhel9-test-atlas
32353235
display_name: Atlas Cluster Tests
3236-
run_on: rhel80-large
3236+
run_on: rhel90-large
32373237
tasks:
32383238
- test_atlas_task_group
3239-
- name: rhel8-no-auth-tests
3239+
- name: rhel9-no-auth-tests
32403240
display_name: No Auth Tests
3241-
run_on: rhel80-large
3241+
run_on: rhel90-large
32423242
expansions:
32433243
CLIENT_ENCRYPTION: true
32443244
tasks:
@@ -3266,19 +3266,19 @@ buildvariants:
32663266
- test-4.2-server-noauth
32673267
- test-4.2-replica_set-noauth
32683268
- test-4.2-sharded_cluster-noauth
3269-
- name: rhel8-test-lambda
3269+
- name: rhel9-test-lambda
32703270
display_name: AWS Lambda handler tests
3271-
run_on: rhel80-large
3271+
run_on: rhel90-large
32723272
tasks:
32733273
- test-lambda-example
32743274
- test-lambda-aws-auth-example
3275-
- name: rhel8-test-search-indexes
3275+
- name: rhel9-test-search-indexes
32763276
display_name: Search Index Tests
3277-
run_on: rhel80-large
3277+
run_on: rhel90-large
32783278
tasks:
32793279
- test_atlas_task_group_search_indexes
32803280
- name: resource management tests
32813281
display_name: resource management tests
3282-
run_on: rhel80-large
3282+
run_on: rhel90-large
32833283
tasks:
32843284
- .resource-management

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ const {
1616
WINDOWS_OS,
1717
MACOS_OS,
1818
UBUNTU_20_OS,
19-
DEBIAN_OS,
20-
UBUNTU_22_OS
19+
DEBIAN_OS
2120
} = require('./ci_matrix_constants');
2221

2322
const OPERATING_SYSTEMS = [
2423
{
2524
name: DEFAULT_OS,
26-
display_name: 'rhel8',
25+
display_name: 'rhel9',
2726
run_on: DEFAULT_OS
2827
},
2928
{
@@ -451,7 +450,7 @@ const MONGOCRYPTD_CSFLE_TASKS = MONGODB_VERSIONS.filter(
451450
});
452451

453452
for (const nodeVersion of [LOWEST_LTS, LATEST_LTS]) {
454-
const name = `rhel8-node${nodeVersion}-test-csfle-mongocryptd`;
453+
const name = `rhel9-node${nodeVersion}-test-csfle-mongocryptd`;
455454
const displayName = `rhel 8 Node${nodeVersion} test mongocryptd`;
456455
BUILD_VARIANTS.push({
457456
name,
@@ -734,14 +733,14 @@ function addPerformanceTasks() {
734733
addPerformanceTasks();
735734

736735
BUILD_VARIANTS.push({
737-
name: 'rhel8-custom-dependency-tests',
736+
name: 'rhel9-custom-dependency-tests',
738737
display_name: 'Custom Dependency Version Test',
739738
run_on: DEFAULT_OS,
740739
tasks: customDependencyTests.map(({ name }) => name)
741740
});
742741

743742
BUILD_VARIANTS.push({
744-
name: 'rhel8-test-gcp-kms',
743+
name: 'debian11-small-test-gcp-kms',
745744
display_name: 'GCP KMS Test',
746745
run_on: DEBIAN_OS,
747746
tasks: ['test_gcpkms_task_group', 'test-gcpkms-fail-task']
@@ -775,14 +774,14 @@ BUILD_VARIANTS.push({
775774
});
776775

777776
BUILD_VARIANTS.push({
778-
name: 'rhel8-test-atlas',
777+
name: 'rhel9-test-atlas',
779778
display_name: 'Atlas Cluster Tests',
780779
run_on: DEFAULT_OS,
781780
tasks: ['test_atlas_task_group']
782781
});
783782

784783
BUILD_VARIANTS.push({
785-
name: 'rhel8-no-auth-tests',
784+
name: 'rhel9-no-auth-tests',
786785
display_name: 'No Auth Tests',
787786
run_on: DEFAULT_OS,
788787
expansions: {
@@ -792,14 +791,14 @@ BUILD_VARIANTS.push({
792791
});
793792

794793
BUILD_VARIANTS.push({
795-
name: 'rhel8-test-lambda',
794+
name: 'rhel9-test-lambda',
796795
display_name: 'AWS Lambda handler tests',
797796
run_on: DEFAULT_OS,
798797
tasks: ['test-lambda-example', 'test-lambda-aws-auth-example']
799798
});
800799

801800
BUILD_VARIANTS.push({
802-
name: 'rhel8-test-search-indexes',
801+
name: 'rhel9-test-search-indexes',
803802
display_name: 'Search Index Tests',
804803
run_on: DEFAULT_OS,
805804
tasks: ['test_atlas_task_group_search_indexes']

0 commit comments

Comments
 (0)