From f19f32a2565c782f4f3bc0ae659cd7f32c81c3d9 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Tue, 6 Jan 2026 13:16:42 -0800 Subject: [PATCH 1/3] skip failing Windows tests --- .evergreen/config.yml | 57 +++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 554be3a0191..b15929dca35 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3075,9 +3075,6 @@ buildvariants: CLIENT_ENCRYPTION: 'false' TEST_CSFLE: 'false' tasks: - - test-latest-server - - test-latest-replica_set - - test-latest-sharded_cluster - test-rapid-server - test-rapid-replica_set - test-rapid-sharded_cluster @@ -3099,18 +3096,22 @@ buildvariants: - test-4.2-server - test-4.2-replica_set - test-4.2-sharded_cluster - - test-latest-server-v1-api - - test-socks5 - - test-socks5-tls - - test-snappy-compression - - test-zstd-compression - - test-tls-support-latest - test-tls-support-8.0 - test-tls-support-7.0 - test-tls-support-6.0 - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 + # TODO(NODE-7356) - Unskip latest Windows NODE test builds + # - test-latest-replica_set + # - test-latest-server + # - test-latest-server-v1-api + # - test-latest-sharded_cluster + # - test-snappy-compression + # - test-socks5 + # - test-socks5-tls + # - test-tls-support-latest + # - test-zstd-compression - name: windows-vsCurrent-large-Node22 display_name: Windows Node22 run_on: windows-vsCurrent-large @@ -3119,9 +3120,6 @@ buildvariants: CLIENT_ENCRYPTION: 'false' TEST_CSFLE: 'false' tasks: - - test-latest-server - - test-latest-replica_set - - test-latest-sharded_cluster - test-rapid-server - test-rapid-replica_set - test-rapid-sharded_cluster @@ -3143,18 +3141,22 @@ buildvariants: - test-4.2-server - test-4.2-replica_set - test-4.2-sharded_cluster - - test-latest-server-v1-api - - test-socks5 - - test-socks5-tls - - test-snappy-compression - - test-zstd-compression - - test-tls-support-latest - test-tls-support-8.0 - test-tls-support-7.0 - test-tls-support-6.0 - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 + # TODO(NODE-7356) - Unskip latest Windows NODE test builds + # - test-latest-replica_set + # - test-latest-server + # - test-latest-server-v1-api + # - test-latest-sharded_cluster + # - test-snappy-compression + # - test-socks5 + # - test-socks5-tls + # - test-tls-support-latest + # - test-zstd-compression - name: windows-vsCurrent-large-Node24 display_name: Windows Node24 run_on: windows-vsCurrent-large @@ -3163,9 +3165,6 @@ buildvariants: CLIENT_ENCRYPTION: 'false' TEST_CSFLE: 'false' tasks: - - test-latest-server - - test-latest-replica_set - - test-latest-sharded_cluster - test-rapid-server - test-rapid-replica_set - test-rapid-sharded_cluster @@ -3187,18 +3186,22 @@ buildvariants: - test-4.2-server - test-4.2-replica_set - test-4.2-sharded_cluster - - test-latest-server-v1-api - - test-socks5 - - test-socks5-tls - - test-snappy-compression - - test-zstd-compression - - test-tls-support-latest - test-tls-support-8.0 - test-tls-support-7.0 - test-tls-support-6.0 - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 + # TODO(NODE-7356) - Unskip latest Windows NODE test builds + # - test-latest-replica_set + # - test-latest-server + # - test-latest-server-v1-api + # - test-latest-sharded_cluster + # - test-snappy-compression + # - test-socks5 + # - test-socks5-tls + # - test-tls-support-latest + # - test-zstd-compression - name: rhel8-node20.19.0-test-csfle-mongocryptd display_name: rhel 8 Node20.19.0 test mongocryptd run_on: rhel80-large From f68026a95827b3c6be63fd5e89611fe13ca8a7a4 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Tue, 6 Jan 2026 15:33:07 -0800 Subject: [PATCH 2/3] pr feedback: updated the config generator to skip certain Windows tests --- .evergreen/config.yml | 43 +++++++------------------- .evergreen/generate_evergreen_tasks.js | 24 ++++++++------ 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b15929dca35..7864486e01b 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1425,7 +1425,8 @@ tasks: - func: assume secrets manager role - func: run ldap tests - name: test-socks5 - tags: [] + tags: + - socks5 commands: - command: expansions.update type: setup @@ -1451,7 +1452,8 @@ tasks: - func: bootstrap mongo-orchestration - func: run socks5 tests - name: test-socks5-tls - tags: [] + tags: + - socks5-tls commands: - command: expansions.update type: setup @@ -1502,6 +1504,7 @@ tasks: - name: test-tls-support-latest tags: - tls-support + - tls-support-latest commands: - command: expansions.update type: setup @@ -1517,6 +1520,7 @@ tasks: - name: test-tls-support-8.0 tags: - tls-support + - tls-support-8.0 commands: - command: expansions.update type: setup @@ -1532,6 +1536,7 @@ tasks: - name: test-tls-support-7.0 tags: - tls-support + - tls-support-7.0 commands: - command: expansions.update type: setup @@ -1547,6 +1552,7 @@ tasks: - name: test-tls-support-6.0 tags: - tls-support + - tls-support-6.0 commands: - command: expansions.update type: setup @@ -1562,6 +1568,7 @@ tasks: - name: test-tls-support-5.0 tags: - tls-support + - tls-support-5.0 commands: - command: expansions.update type: setup @@ -1577,6 +1584,7 @@ tasks: - name: test-tls-support-4.4 tags: - tls-support + - tls-support-4.4 commands: - command: expansions.update type: setup @@ -1592,6 +1600,7 @@ tasks: - name: test-tls-support-4.2 tags: - tls-support + - tls-support-4.2 commands: - command: expansions.update type: setup @@ -3102,16 +3111,6 @@ buildvariants: - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 - # TODO(NODE-7356) - Unskip latest Windows NODE test builds - # - test-latest-replica_set - # - test-latest-server - # - test-latest-server-v1-api - # - test-latest-sharded_cluster - # - test-snappy-compression - # - test-socks5 - # - test-socks5-tls - # - test-tls-support-latest - # - test-zstd-compression - name: windows-vsCurrent-large-Node22 display_name: Windows Node22 run_on: windows-vsCurrent-large @@ -3147,16 +3146,6 @@ buildvariants: - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 - # TODO(NODE-7356) - Unskip latest Windows NODE test builds - # - test-latest-replica_set - # - test-latest-server - # - test-latest-server-v1-api - # - test-latest-sharded_cluster - # - test-snappy-compression - # - test-socks5 - # - test-socks5-tls - # - test-tls-support-latest - # - test-zstd-compression - name: windows-vsCurrent-large-Node24 display_name: Windows Node24 run_on: windows-vsCurrent-large @@ -3192,16 +3181,6 @@ buildvariants: - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 - # TODO(NODE-7356) - Unskip latest Windows NODE test builds - # - test-latest-replica_set - # - test-latest-server - # - test-latest-server-v1-api - # - test-latest-sharded_cluster - # - test-snappy-compression - # - test-socks5 - # - test-socks5-tls - # - test-tls-support-latest - # - test-zstd-compression - name: rhel8-node20.19.0-test-csfle-mongocryptd display_name: rhel 8 Node20.19.0 test mongocryptd run_on: rhel80-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 2858909126d..64ea7772aea 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -45,7 +45,13 @@ const WINDOWS_SKIP_TAGS = new Set([ 'auth', 'load_balancer', 'socks5-csfle', - 'oidc' + 'oidc', + + // TODO: NODE-7356: enable skipped tests on windows + 'latest', + 'socks5', + 'socks5-tls', + 'tls-support-latest' ]); const TASKS = []; @@ -67,11 +73,11 @@ function updateExpansions(expansions) { function makeTask({ mongoVersion, topology, tags = [], auth = 'auth', nodeLtsVersion }) { const expansions = nodeLtsVersion ? updateExpansions({ - VERSION: mongoVersion, - TOPOLOGY: topology, - AUTH: auth, - NODE_LTS_VERSION: nodeLtsVersion - }) + VERSION: mongoVersion, + TOPOLOGY: topology, + AUTH: auth, + NODE_LTS_VERSION: nodeLtsVersion + }) : updateExpansions({ VERSION: mongoVersion, TOPOLOGY: topology, AUTH: auth }); return { name: `test-${mongoVersion}-${topology}${auth === 'noauth' ? '-noauth' : ''}`, @@ -181,7 +187,7 @@ TASKS.push( }, { name: 'test-socks5', - tags: [], + tags: ['socks5'], commands: [ updateExpansions({ VERSION: 'latest', @@ -208,7 +214,7 @@ TASKS.push( }, { name: 'test-socks5-tls', - tags: [], + tags: ['socks5-tls'], commands: [ updateExpansions({ SSL: 'ssl', @@ -298,7 +304,7 @@ AWS_LAMBDA_HANDLER_TASKS.push({ for (const VERSION of TLS_VERSIONS) { TASKS.push({ name: `test-tls-support-${VERSION}`, - tags: ['tls-support'], + tags: ['tls-support', `tls-support-${VERSION}`], commands: [ updateExpansions({ VERSION, From 638899605f7ff8f4a8c89025fc952458cdd00d04 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Wed, 7 Jan 2026 07:38:53 -0800 Subject: [PATCH 3/3] lint fix --- .evergreen/generate_evergreen_tasks.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 64ea7772aea..6b036e04efd 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -73,11 +73,11 @@ function updateExpansions(expansions) { function makeTask({ mongoVersion, topology, tags = [], auth = 'auth', nodeLtsVersion }) { const expansions = nodeLtsVersion ? updateExpansions({ - VERSION: mongoVersion, - TOPOLOGY: topology, - AUTH: auth, - NODE_LTS_VERSION: nodeLtsVersion - }) + VERSION: mongoVersion, + TOPOLOGY: topology, + AUTH: auth, + NODE_LTS_VERSION: nodeLtsVersion + }) : updateExpansions({ VERSION: mongoVersion, TOPOLOGY: topology, AUTH: auth }); return { name: `test-${mongoVersion}-${topology}${auth === 'noauth' ? '-noauth' : ''}`,