Skip to content

Commit f68026a

Browse files
committed
pr feedback: updated the config generator to skip certain Windows tests
1 parent 9bd0dbe commit f68026a

2 files changed

Lines changed: 26 additions & 41 deletions

File tree

.evergreen/config.yml

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,8 @@ tasks:
14251425
- func: assume secrets manager role
14261426
- func: run ldap tests
14271427
- name: test-socks5
1428-
tags: []
1428+
tags:
1429+
- socks5
14291430
commands:
14301431
- command: expansions.update
14311432
type: setup
@@ -1451,7 +1452,8 @@ tasks:
14511452
- func: bootstrap mongo-orchestration
14521453
- func: run socks5 tests
14531454
- name: test-socks5-tls
1454-
tags: []
1455+
tags:
1456+
- socks5-tls
14551457
commands:
14561458
- command: expansions.update
14571459
type: setup
@@ -1502,6 +1504,7 @@ tasks:
15021504
- name: test-tls-support-latest
15031505
tags:
15041506
- tls-support
1507+
- tls-support-latest
15051508
commands:
15061509
- command: expansions.update
15071510
type: setup
@@ -1517,6 +1520,7 @@ tasks:
15171520
- name: test-tls-support-8.0
15181521
tags:
15191522
- tls-support
1523+
- tls-support-8.0
15201524
commands:
15211525
- command: expansions.update
15221526
type: setup
@@ -1532,6 +1536,7 @@ tasks:
15321536
- name: test-tls-support-7.0
15331537
tags:
15341538
- tls-support
1539+
- tls-support-7.0
15351540
commands:
15361541
- command: expansions.update
15371542
type: setup
@@ -1547,6 +1552,7 @@ tasks:
15471552
- name: test-tls-support-6.0
15481553
tags:
15491554
- tls-support
1555+
- tls-support-6.0
15501556
commands:
15511557
- command: expansions.update
15521558
type: setup
@@ -1562,6 +1568,7 @@ tasks:
15621568
- name: test-tls-support-5.0
15631569
tags:
15641570
- tls-support
1571+
- tls-support-5.0
15651572
commands:
15661573
- command: expansions.update
15671574
type: setup
@@ -1577,6 +1584,7 @@ tasks:
15771584
- name: test-tls-support-4.4
15781585
tags:
15791586
- tls-support
1587+
- tls-support-4.4
15801588
commands:
15811589
- command: expansions.update
15821590
type: setup
@@ -1592,6 +1600,7 @@ tasks:
15921600
- name: test-tls-support-4.2
15931601
tags:
15941602
- tls-support
1603+
- tls-support-4.2
15951604
commands:
15961605
- command: expansions.update
15971606
type: setup
@@ -3102,16 +3111,6 @@ buildvariants:
31023111
- test-tls-support-5.0
31033112
- test-tls-support-4.4
31043113
- test-tls-support-4.2
3105-
# TODO(NODE-7356) - Unskip latest Windows NODE test builds
3106-
# - test-latest-replica_set
3107-
# - test-latest-server
3108-
# - test-latest-server-v1-api
3109-
# - test-latest-sharded_cluster
3110-
# - test-snappy-compression
3111-
# - test-socks5
3112-
# - test-socks5-tls
3113-
# - test-tls-support-latest
3114-
# - test-zstd-compression
31153114
- name: windows-vsCurrent-large-Node22
31163115
display_name: Windows Node22
31173116
run_on: windows-vsCurrent-large
@@ -3147,16 +3146,6 @@ buildvariants:
31473146
- test-tls-support-5.0
31483147
- test-tls-support-4.4
31493148
- test-tls-support-4.2
3150-
# TODO(NODE-7356) - Unskip latest Windows NODE test builds
3151-
# - test-latest-replica_set
3152-
# - test-latest-server
3153-
# - test-latest-server-v1-api
3154-
# - test-latest-sharded_cluster
3155-
# - test-snappy-compression
3156-
# - test-socks5
3157-
# - test-socks5-tls
3158-
# - test-tls-support-latest
3159-
# - test-zstd-compression
31603149
- name: windows-vsCurrent-large-Node24
31613150
display_name: Windows Node24
31623151
run_on: windows-vsCurrent-large
@@ -3192,16 +3181,6 @@ buildvariants:
31923181
- test-tls-support-5.0
31933182
- test-tls-support-4.4
31943183
- test-tls-support-4.2
3195-
# TODO(NODE-7356) - Unskip latest Windows NODE test builds
3196-
# - test-latest-replica_set
3197-
# - test-latest-server
3198-
# - test-latest-server-v1-api
3199-
# - test-latest-sharded_cluster
3200-
# - test-snappy-compression
3201-
# - test-socks5
3202-
# - test-socks5-tls
3203-
# - test-tls-support-latest
3204-
# - test-zstd-compression
32053184
- name: rhel8-node20.19.0-test-csfle-mongocryptd
32063185
display_name: rhel 8 Node20.19.0 test mongocryptd
32073186
run_on: rhel80-large

.evergreen/generate_evergreen_tasks.js

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

5157
const TASKS = [];
@@ -67,11 +73,11 @@ function updateExpansions(expansions) {
6773
function makeTask({ mongoVersion, topology, tags = [], auth = 'auth', nodeLtsVersion }) {
6874
const expansions = nodeLtsVersion
6975
? updateExpansions({
70-
VERSION: mongoVersion,
71-
TOPOLOGY: topology,
72-
AUTH: auth,
73-
NODE_LTS_VERSION: nodeLtsVersion
74-
})
76+
VERSION: mongoVersion,
77+
TOPOLOGY: topology,
78+
AUTH: auth,
79+
NODE_LTS_VERSION: nodeLtsVersion
80+
})
7581
: updateExpansions({ VERSION: mongoVersion, TOPOLOGY: topology, AUTH: auth });
7682
return {
7783
name: `test-${mongoVersion}-${topology}${auth === 'noauth' ? '-noauth' : ''}`,
@@ -181,7 +187,7 @@ TASKS.push(
181187
},
182188
{
183189
name: 'test-socks5',
184-
tags: [],
190+
tags: ['socks5'],
185191
commands: [
186192
updateExpansions({
187193
VERSION: 'latest',
@@ -208,7 +214,7 @@ TASKS.push(
208214
},
209215
{
210216
name: 'test-socks5-tls',
211-
tags: [],
217+
tags: ['socks5-tls'],
212218
commands: [
213219
updateExpansions({
214220
SSL: 'ssl',
@@ -298,7 +304,7 @@ AWS_LAMBDA_HANDLER_TASKS.push({
298304
for (const VERSION of TLS_VERSIONS) {
299305
TASKS.push({
300306
name: `test-tls-support-${VERSION}`,
301-
tags: ['tls-support'],
307+
tags: ['tls-support', `tls-support-${VERSION}`],
302308
commands: [
303309
updateExpansions({
304310
VERSION,

0 commit comments

Comments
 (0)