Skip to content

Commit 261199f

Browse files
authored
ci(NODE-5313): change windows hosts to vsCurrent (#3690)
1 parent 8fb0611 commit 261199f

File tree

3 files changed

+34
-22
lines changed

3 files changed

+34
-22
lines changed

.evergreen/ci_matrix_constants.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ const AWS_AUTH_VERSIONS = ['latest', '6.0', '5.0', '4.4'];
1616
const TLS_VERSIONS = ['latest', '6.0', '5.0', '4.4', '4.2'];
1717

1818
const DEFAULT_OS = 'rhel80-large';
19+
const WINDOWS_OS = 'windows-vsCurrent-large';
20+
const MACOS_OS = 'macos-1100';
21+
const UBUNTU_OS = 'ubuntu1804-large';
22+
const DEBIAN_OS = 'debian11-small';
1923

2024
module.exports = {
2125
MONGODB_VERSIONS,
@@ -26,5 +30,9 @@ module.exports = {
2630
TOPOLOGIES,
2731
AWS_AUTH_VERSIONS,
2832
TLS_VERSIONS,
29-
DEFAULT_OS
33+
DEFAULT_OS,
34+
WINDOWS_OS,
35+
MACOS_OS,
36+
UBUNTU_OS,
37+
DEBIAN_OS
3038
};

.evergreen/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,9 +3407,9 @@ buildvariants:
34073407
- test-tls-support-5.0
34083408
- test-tls-support-4.4
34093409
- test-tls-support-4.2
3410-
- name: windows-64-vs2019-fermium
3411-
display_name: Windows (VS2019) Node14
3412-
run_on: windows-64-vs2019-large
3410+
- name: windows-vsCurrent-large-fermium
3411+
display_name: Windows Node14
3412+
run_on: windows-vsCurrent-large
34133413
expansions:
34143414
NODE_LTS_VERSION: 14
34153415
tasks:
@@ -3451,9 +3451,9 @@ buildvariants:
34513451
- test-tls-support-5.0
34523452
- test-tls-support-4.4
34533453
- test-tls-support-4.2
3454-
- name: windows-64-vs2019-gallium
3455-
display_name: Windows (VS2019) Node16
3456-
run_on: windows-64-vs2019-large
3454+
- name: windows-vsCurrent-large-gallium
3455+
display_name: Windows Node16
3456+
run_on: windows-vsCurrent-large
34573457
expansions:
34583458
NODE_LTS_VERSION: 16
34593459
tasks:
@@ -3493,9 +3493,9 @@ buildvariants:
34933493
- test-tls-support-5.0
34943494
- test-tls-support-4.4
34953495
- test-tls-support-4.2
3496-
- name: windows-64-vs2019-hydrogen
3497-
display_name: Windows (VS2019) Node18
3498-
run_on: windows-64-vs2019-large
3496+
- name: windows-vsCurrent-large-hydrogen
3497+
display_name: Windows Node18
3498+
run_on: windows-vsCurrent-large
34993499
expansions:
35003500
NODE_LTS_VERSION: 18
35013501
tasks:
@@ -3535,9 +3535,9 @@ buildvariants:
35353535
- test-tls-support-5.0
35363536
- test-tls-support-4.4
35373537
- test-tls-support-4.2
3538-
- name: windows-64-vs2019-Node20
3539-
display_name: Windows (VS2019) Node20
3540-
run_on: windows-64-vs2019-large
3538+
- name: windows-vsCurrent-large-Node20
3539+
display_name: Windows Node20
3540+
run_on: windows-vsCurrent-large
35413541
expansions:
35423542
NODE_LTS_VERSION: 20
35433543
tasks:

.evergreen/generate_evergreen_tasks.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,23 @@ const {
1111
TOPOLOGIES,
1212
AWS_AUTH_VERSIONS,
1313
TLS_VERSIONS,
14-
DEFAULT_OS
14+
DEFAULT_OS,
15+
WINDOWS_OS,
16+
MACOS_OS,
17+
UBUNTU_OS,
18+
DEBIAN_OS
1519
} = require('./ci_matrix_constants');
1620

1721
const OPERATING_SYSTEMS = [
1822
{
19-
name: 'rhel80-large',
23+
name: DEFAULT_OS,
2024
display_name: 'rhel8',
2125
run_on: DEFAULT_OS
2226
},
2327
{
24-
name: 'windows-64-vs2019',
25-
display_name: 'Windows (VS2019)',
26-
run_on: 'windows-64-vs2019-large',
28+
name: WINDOWS_OS,
29+
display_name: 'Windows',
30+
run_on: WINDOWS_OS,
2731
clientEncryption: false // TODO(NODE-3401): Unskip when Windows no longer fails to launch mongocryptd occasionally
2832
}
2933
].map(osConfig => ({
@@ -421,11 +425,11 @@ for (const {
421425
}
422426

423427
BUILD_VARIANTS.push({
424-
name: 'macos-1100',
428+
name: MACOS_OS,
425429
display_name: `MacOS 11 Node${
426430
versions.find(version => version.versionNumber === LATEST_LTS).versionNumber
427431
}`,
428-
run_on: 'macos-1100',
432+
run_on: MACOS_OS,
429433
expansions: {
430434
NODE_LTS_VERSION: LATEST_LTS,
431435
CLIENT_ENCRYPTION: true
@@ -545,15 +549,15 @@ BUILD_VARIANTS.push({
545549
BUILD_VARIANTS.push({
546550
name: 'mongosh_integration_tests',
547551
display_name: 'mongosh integration tests',
548-
run_on: 'ubuntu1804-large',
552+
run_on: UBUNTU_OS,
549553
tasks: mongoshTasks.map(({ name }) => name)
550554
});
551555

552556
// special case for MONGODB-AWS authentication
553557
BUILD_VARIANTS.push({
554558
name: 'ubuntu1804-test-mongodb-aws',
555559
display_name: 'MONGODB-AWS Auth test',
556-
run_on: 'ubuntu1804-large',
560+
run_on: UBUNTU_OS,
557561
expansions: {
558562
NODE_LTS_VERSION: LOWEST_LTS
559563
},

0 commit comments

Comments
 (0)