From f05640433115f5479017f9c2dc7d24f4589011ac Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Thu, 26 Mar 2026 12:32:48 -0700 Subject: [PATCH 1/4] test(NODE-7498): remove 3 linux-specific tests from Windows Nodeless variant --- .evergreen/generate_evergreen_tasks.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 291f7670f4..3a251a63b5 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -823,9 +823,6 @@ const nodelessTasks = [ 'test-latest-server-v1-api', 'test-x509-authentication', 'test-atlas-connectivity', - 'test-rapid-load-balanced', - 'test-latest-load-balanced', - 'test-auth-kerberos', 'test-auth-ldap', 'test-socks5-csfle', 'test-socks5-tls', From 5a93bbcbfa991d98ef5e7940d85bf969e1b82ce7 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Thu, 26 Mar 2026 13:45:36 -0700 Subject: [PATCH 2/4] regen --- .evergreen/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fe48d3b9be..6494659652 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -4040,9 +4040,6 @@ buildvariants: - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity - - test-rapid-load-balanced - - test-latest-load-balanced - - test-auth-kerberos - test-auth-ldap - test-socks5-csfle - test-socks5-tls @@ -4066,9 +4063,6 @@ buildvariants: - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity - - test-rapid-load-balanced - - test-latest-load-balanced - - test-auth-kerberos - test-auth-ldap - test-socks5-csfle - test-socks5-tls From cded8bbbb863fc8b28c4f3a072cd09a52ed04c8c Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Mon, 30 Mar 2026 08:28:02 -0700 Subject: [PATCH 3/4] pr feedback: only exclude kerberos and lb tests from windows --- .evergreen/config.yml | 3 +++ .evergreen/generate_evergreen_tasks.js | 27 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 6494659652..16ae3b26b8 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -4046,6 +4046,9 @@ buildvariants: - test-snappy-compression - test-zstd-compression - test-tls-support-latest + - test-rapid-load-balanced + - test-latest-load-balanced + - test-auth-kerberos expansions: NODE_LTS_VERSION: 24 CLIENT_ENCRYPTION: true diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 3a251a63b5..c580d93453 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -75,12 +75,12 @@ function makeTask({ }) { const baseExpansions = nodeLtsVersion ? { - VERSION: mongoVersion, - TOPOLOGY: topology, - AUTH: auth, - SSL: ssl, - NODE_LTS_VERSION: nodeLtsVersion - } + VERSION: mongoVersion, + TOPOLOGY: topology, + AUTH: auth, + SSL: ssl, + NODE_LTS_VERSION: nodeLtsVersion + } : { VERSION: mongoVersion, TOPOLOGY: topology, SSL: ssl, AUTH: auth }; if (testCsfle) { @@ -813,7 +813,7 @@ BUILD_VARIANTS.push({ }); // small subset of tests to run on nodeless environments -const nodelessTasks = [ +const commonNodelessTasks = [ 'test-latest-server', 'test-latest-replica_set', 'test-latest-sharded_cluster', @@ -830,6 +830,15 @@ const nodelessTasks = [ 'test-zstd-compression', 'test-tls-support-latest' ]; +// small subset of linux-specific tests to run on nodeless environments +const linuxOnlyTests = [ + 'test-rapid-load-balanced', + 'test-latest-load-balanced', + 'test-auth-kerberos', +]; + +const linuxNodelessTasks = commonNodelessTasks.concat(linuxOnlyTests); + const nodelessExpansions = { NODE_LTS_VERSION: LATEST_LTS, CLIENT_ENCRYPTION: true, @@ -839,14 +848,14 @@ BUILD_VARIANTS.push({ name: 'rhel8-nodeless', display_name: 'Nodeless', run_on: DEFAULT_OS, - tasks: nodelessTasks, + tasks: linuxNodelessTasks, expansions: nodelessExpansions }); BUILD_VARIANTS.push({ name: 'windows-nodeless', display_name: 'Windows Nodeless', run_on: WINDOWS_OS, - tasks: nodelessTasks, + tasks: commonNodelessTasks, expansions: nodelessExpansions }); From f97c40fa8be6e11c922ba38152f84183dc9f0c5d Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Mon, 30 Mar 2026 09:40:39 -0700 Subject: [PATCH 4/4] fix lint --- .evergreen/generate_evergreen_tasks.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index b5efb68e85..a866e26ff0 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -83,12 +83,12 @@ function makeTask({ }) { const baseExpansions = nodeLtsVersion ? { - VERSION: mongoVersion, - TOPOLOGY: topology, - AUTH: auth, - SSL: ssl, - NODE_LTS_VERSION: nodeLtsVersion - } + VERSION: mongoVersion, + TOPOLOGY: topology, + AUTH: auth, + SSL: ssl, + NODE_LTS_VERSION: nodeLtsVersion + } : { VERSION: mongoVersion, TOPOLOGY: topology, SSL: ssl, AUTH: auth }; if (testCsfle) { @@ -850,7 +850,7 @@ const commonNodelessTasks = [ const linuxOnlyTests = [ 'test-rapid-load-balanced', 'test-latest-load-balanced', - 'test-auth-kerberos', + 'test-auth-kerberos' ]; const linuxNodelessTasks = commonNodelessTasks.concat(linuxOnlyTests);