Skip to content

Commit 63ae351

Browse files
nbbeekendurran
andauthored
ci(NODE-5312): change windows hosts to vsCurrent (#3687)
Co-authored-by: Durran Jordan <[email protected]>
1 parent da12eb9 commit 63ae351

File tree

3 files changed

+33
-21
lines changed

3 files changed

+33
-21
lines changed

.evergreen/ci_matrix_constants.js

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

1616
const DEFAULT_OS = 'rhel80-large';
17+
const WINDOWS_OS = 'windows-vsCurrent-large';
18+
const MACOS_OS = 'macos-1100';
19+
const UBUNTU_OS = 'ubuntu1804-large';
20+
const DEBIAN_OS = 'debian11-small';
1721

1822
module.exports = {
1923
MONGODB_VERSIONS,
@@ -24,5 +28,9 @@ module.exports = {
2428
TOPOLOGIES,
2529
AWS_AUTH_VERSIONS,
2630
TLS_VERSIONS,
27-
DEFAULT_OS
31+
DEFAULT_OS,
32+
WINDOWS_OS,
33+
MACOS_OS,
34+
UBUNTU_OS,
35+
DEBIAN_OS
2836
};

.evergreen/config.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,9 +3657,9 @@ buildvariants:
36573657
- test-tls-support-5.0
36583658
- test-tls-support-4.4
36593659
- test-tls-support-4.2
3660-
- name: windows-64-vs2019-gallium
3661-
display_name: Windows (VS2019) Node16
3662-
run_on: windows-64-vs2019-large
3660+
- name: windows-vsCurrent-large-gallium
3661+
display_name: Windows Node16
3662+
run_on: windows-vsCurrent-large
36633663
expansions:
36643664
NODE_LTS_VERSION: 16
36653665
tasks:
@@ -3699,9 +3699,9 @@ buildvariants:
36993699
- test-tls-support-5.0
37003700
- test-tls-support-4.4
37013701
- test-tls-support-4.2
3702-
- name: windows-64-vs2019-hydrogen
3703-
display_name: Windows (VS2019) Node18
3704-
run_on: windows-64-vs2019-large
3702+
- name: windows-vsCurrent-large-hydrogen
3703+
display_name: Windows Node18
3704+
run_on: windows-vsCurrent-large
37053705
expansions:
37063706
NODE_LTS_VERSION: 18
37073707
tasks:
@@ -3741,9 +3741,9 @@ buildvariants:
37413741
- test-tls-support-5.0
37423742
- test-tls-support-4.4
37433743
- test-tls-support-4.2
3744-
- name: windows-64-vs2019-Node20
3745-
display_name: Windows (VS2019) Node20
3746-
run_on: windows-64-vs2019-large
3744+
- name: windows-vsCurrent-large-Node20
3745+
display_name: Windows Node20
3746+
run_on: windows-vsCurrent-large
37473747
expansions:
37483748
NODE_LTS_VERSION: 20
37493749
tasks:

.evergreen/generate_evergreen_tasks.js

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

1822
const OPERATING_SYSTEMS = [
1923
{
20-
name: 'rhel80-large',
24+
name: DEFAULT_OS,
2125
display_name: 'rhel8',
2226
run_on: DEFAULT_OS
2327
},
2428
{
25-
name: 'windows-64-vs2019',
26-
display_name: 'Windows (VS2019)',
27-
run_on: 'windows-64-vs2019-large',
29+
name: WINDOWS_OS,
30+
display_name: 'Windows',
31+
run_on: WINDOWS_OS,
2832
clientEncryption: false // TODO(NODE-3401): Unskip when Windows no longer fails to launch mongocryptd occasionally
2933
}
3034
].map(osConfig => ({
@@ -511,9 +515,9 @@ for (const nodeVersion of [LOWEST_LTS, LATEST_LTS]) {
511515
}
512516

513517
BUILD_VARIANTS.push({
514-
name: 'macos-1100',
518+
name: MACOS_OS,
515519
display_name: `MacOS 11 Node${LATEST_LTS}`,
516-
run_on: 'macos-1100',
520+
run_on: MACOS_OS,
517521
expansions: {
518522
NODE_LTS_VERSION: LATEST_LTS,
519523
CLIENT_ENCRYPTION: true
@@ -633,15 +637,15 @@ BUILD_VARIANTS.push({
633637
BUILD_VARIANTS.push({
634638
name: 'mongosh_integration_tests',
635639
display_name: 'mongosh integration tests',
636-
run_on: 'ubuntu1804-large',
640+
run_on: UBUNTU_OS,
637641
tasks: mongoshTasks.map(({ name }) => name)
638642
});
639643

640644
// special case for MONGODB-AWS authentication
641645
BUILD_VARIANTS.push({
642646
name: 'ubuntu1804-test-mongodb-aws',
643647
display_name: 'MONGODB-AWS Auth test',
644-
run_on: 'ubuntu1804-large',
648+
run_on: UBUNTU_OS,
645649
expansions: {
646650
NODE_LTS_VERSION: LOWEST_LTS
647651
},
@@ -718,14 +722,14 @@ BUILD_VARIANTS.push({
718722
BUILD_VARIANTS.push({
719723
name: 'rhel8-test-gcp-kms',
720724
display_name: 'GCP KMS Test',
721-
run_on: 'debian11-small',
725+
run_on: DEBIAN_OS,
722726
tasks: ['test_gcpkms_task_group', 'test-gcpkms-fail-task']
723727
});
724728

725729
BUILD_VARIANTS.push({
726730
name: 'debian11-test-azure-kms',
727731
display_name: 'Azure KMS Test',
728-
run_on: 'debian11-small',
732+
run_on: DEBIAN_OS,
729733
batchtime: 20160,
730734
tasks: ['test_azurekms_task_group', 'test-azurekms-fail-task']
731735
});

0 commit comments

Comments
 (0)