Skip to content

Commit b248512

Browse files
committed
ci refactor
1 parent 971cc26 commit b248512

2 files changed

Lines changed: 23 additions & 8 deletions

File tree

.evergreen/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4041,6 +4041,10 @@ buildvariants:
40414041
- test-snappy-compression
40424042
- test-zstd-compression
40434043
- test-tls-support-latest
4044+
expansions:
4045+
NODE_LTS_VERSION: 24
4046+
CLIENT_ENCRYPTION: true
4047+
MONGODB_BUNDLED: true
40444048
- name: windows-nodeless
40454049
display_name: Windows Nodeless
40464050
run_on: windows-2022-latest-large
@@ -4063,3 +4067,7 @@ buildvariants:
40634067
- test-snappy-compression
40644068
- test-zstd-compression
40654069
- test-tls-support-latest
4070+
expansions:
4071+
NODE_LTS_VERSION: 24
4072+
CLIENT_ENCRYPTION: true
4073+
MONGODB_BUNDLED: true

.evergreen/generate_evergreen_tasks.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ function makeTask({
7575
}) {
7676
const baseExpansions = nodeLtsVersion
7777
? {
78-
VERSION: mongoVersion,
79-
TOPOLOGY: topology,
80-
AUTH: auth,
81-
SSL: ssl,
82-
NODE_LTS_VERSION: nodeLtsVersion
83-
}
78+
VERSION: mongoVersion,
79+
TOPOLOGY: topology,
80+
AUTH: auth,
81+
SSL: ssl,
82+
NODE_LTS_VERSION: nodeLtsVersion
83+
}
8484
: { VERSION: mongoVersion, TOPOLOGY: topology, SSL: ssl, AUTH: auth };
8585

8686
if (testCsfle) {
@@ -833,17 +833,24 @@ const nodelessTasks = [
833833
'test-zstd-compression',
834834
'test-tls-support-latest',
835835
]
836+
const nodelessExpansions = {
837+
NODE_LTS_VERSION: LATEST_LTS,
838+
CLIENT_ENCRYPTION: true,
839+
MONGODB_BUNDLED: true
840+
};
836841
BUILD_VARIANTS.push({
837842
name: 'rhel8-nodeless',
838843
display_name: 'Nodeless',
839844
run_on: DEFAULT_OS,
840-
tasks: nodelessTasks
845+
tasks: nodelessTasks,
846+
expansions: nodelessExpansions
841847
});
842848
BUILD_VARIANTS.push({
843849
name: 'windows-nodeless',
844850
display_name: 'Windows Nodeless',
845851
run_on: WINDOWS_OS,
846-
tasks: nodelessTasks
852+
tasks: nodelessTasks,
853+
expansions: nodelessExpansions
847854
});
848855

849856
// TODO(NODE-4897): Debug socks5 tests on node latest

0 commit comments

Comments
 (0)