Skip to content

Commit 7d3e569

Browse files
ci(NODE-7356): use different Windows image, unskip Windows tests (#4837)
Co-authored-by: Bailey Pearson <bailey.pearson@mongodb.com>
1 parent 0f46db8 commit 7d3e569

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

.evergreen/ci_matrix_constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const LB_VERSIONS = MONGODB_VERSIONS.slice(0, MONGODB_VERSIONS.indexOf('5.0') +
1515
LB_VERSIONS.reverse();
1616

1717
const DEFAULT_OS = 'rhel80-large';
18-
const WINDOWS_OS = 'windows-vsCurrent-large';
18+
const WINDOWS_OS = 'windows-2022-latest-large';
1919
const MACOS_OS = 'macos-14-arm64';
2020
const UBUNTU_OS = 'ubuntu1804-large';
2121
const UBUNTU_20_OS = 'ubuntu2004-small';

.evergreen/config.yml

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,14 +3055,17 @@ buildvariants:
30553055
- test-tls-support-5.0
30563056
- test-tls-support-4.4
30573057
- test-tls-support-4.2
3058-
- name: windows-vsCurrent-large-iron
3058+
- name: windows-2022-latest-large-iron
30593059
display_name: Windows Node20.19.0
3060-
run_on: windows-vsCurrent-large
3060+
run_on: windows-2022-latest-large
30613061
expansions:
30623062
NODE_LTS_VERSION: 20.19.0
30633063
CLIENT_ENCRYPTION: 'false'
30643064
TEST_CSFLE: 'false'
30653065
tasks:
3066+
- test-latest-server
3067+
- test-latest-replica_set
3068+
- test-latest-sharded_cluster
30663069
- test-rapid-server
30673070
- test-rapid-replica_set
30683071
- test-rapid-sharded_cluster
@@ -3084,20 +3087,29 @@ buildvariants:
30843087
- test-4.2-server
30853088
- test-4.2-replica_set
30863089
- test-4.2-sharded_cluster
3090+
- test-latest-server-v1-api
3091+
- test-socks5
3092+
- test-socks5-tls
3093+
- test-snappy-compression
3094+
- test-zstd-compression
3095+
- test-tls-support-latest
30873096
- test-tls-support-8.0
30883097
- test-tls-support-7.0
30893098
- test-tls-support-6.0
30903099
- test-tls-support-5.0
30913100
- test-tls-support-4.4
30923101
- test-tls-support-4.2
3093-
- name: windows-vsCurrent-large-Node22
3102+
- name: windows-2022-latest-large-Node22
30943103
display_name: Windows Node22
3095-
run_on: windows-vsCurrent-large
3104+
run_on: windows-2022-latest-large
30963105
expansions:
30973106
NODE_LTS_VERSION: 22
30983107
CLIENT_ENCRYPTION: 'false'
30993108
TEST_CSFLE: 'false'
31003109
tasks:
3110+
- test-latest-server
3111+
- test-latest-replica_set
3112+
- test-latest-sharded_cluster
31013113
- test-rapid-server
31023114
- test-rapid-replica_set
31033115
- test-rapid-sharded_cluster
@@ -3119,20 +3131,29 @@ buildvariants:
31193131
- test-4.2-server
31203132
- test-4.2-replica_set
31213133
- test-4.2-sharded_cluster
3134+
- test-latest-server-v1-api
3135+
- test-socks5
3136+
- test-socks5-tls
3137+
- test-snappy-compression
3138+
- test-zstd-compression
3139+
- test-tls-support-latest
31223140
- test-tls-support-8.0
31233141
- test-tls-support-7.0
31243142
- test-tls-support-6.0
31253143
- test-tls-support-5.0
31263144
- test-tls-support-4.4
31273145
- test-tls-support-4.2
3128-
- name: windows-vsCurrent-large-Node24
3146+
- name: windows-2022-latest-large-Node24
31293147
display_name: Windows Node24
3130-
run_on: windows-vsCurrent-large
3148+
run_on: windows-2022-latest-large
31313149
expansions:
31323150
NODE_LTS_VERSION: 24
31333151
CLIENT_ENCRYPTION: 'false'
31343152
TEST_CSFLE: 'false'
31353153
tasks:
3154+
- test-latest-server
3155+
- test-latest-replica_set
3156+
- test-latest-sharded_cluster
31363157
- test-rapid-server
31373158
- test-rapid-replica_set
31383159
- test-rapid-sharded_cluster
@@ -3154,6 +3175,12 @@ buildvariants:
31543175
- test-4.2-server
31553176
- test-4.2-replica_set
31563177
- test-4.2-sharded_cluster
3178+
- test-latest-server-v1-api
3179+
- test-socks5
3180+
- test-socks5-tls
3181+
- test-snappy-compression
3182+
- test-zstd-compression
3183+
- test-tls-support-latest
31573184
- test-tls-support-8.0
31583185
- test-tls-support-7.0
31593186
- test-tls-support-6.0

.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ const WINDOWS_SKIP_TAGS = new Set([
4545
'auth',
4646
'load_balancer',
4747
'socks5-csfle',
48-
'oidc',
49-
50-
// TODO: NODE-7356: enable skipped tests on windows
51-
'latest',
52-
'socks5',
53-
'socks5-tls',
54-
'tls-support-latest'
48+
'oidc'
5549
]);
5650

5751
const TASKS = [];

0 commit comments

Comments
 (0)