diff --git a/.evergreen/ci_matrix_constants.js b/.evergreen/ci_matrix_constants.js index 9cd842304cb..25424b3be15 100644 --- a/.evergreen/ci_matrix_constants.js +++ b/.evergreen/ci_matrix_constants.js @@ -15,7 +15,7 @@ const LB_VERSIONS = MONGODB_VERSIONS.slice(0, MONGODB_VERSIONS.indexOf('5.0') + LB_VERSIONS.reverse(); const DEFAULT_OS = 'rhel80-large'; -const WINDOWS_OS = 'windows-vsCurrent-large'; +const WINDOWS_OS = 'windows-2022-latest-large'; const MACOS_OS = 'macos-14-arm64'; const UBUNTU_OS = 'ubuntu1804-large'; const UBUNTU_20_OS = 'ubuntu2004-small'; diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f6c677c24b2..cef597ad055 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -3055,14 +3055,17 @@ buildvariants: - test-tls-support-5.0 - test-tls-support-4.4 - test-tls-support-4.2 - - name: windows-vsCurrent-large-iron + - name: windows-2022-latest-large-iron display_name: Windows Node20.19.0 - run_on: windows-vsCurrent-large + run_on: windows-2022-latest-large expansions: NODE_LTS_VERSION: 20.19.0 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 @@ -3084,20 +3087,29 @@ 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 - - name: windows-vsCurrent-large-Node22 + - name: windows-2022-latest-large-Node22 display_name: Windows Node22 - run_on: windows-vsCurrent-large + run_on: windows-2022-latest-large expansions: NODE_LTS_VERSION: 22 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 @@ -3119,20 +3131,29 @@ 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 - - name: windows-vsCurrent-large-Node24 + - name: windows-2022-latest-large-Node24 display_name: Windows Node24 - run_on: windows-vsCurrent-large + run_on: windows-2022-latest-large expansions: NODE_LTS_VERSION: 24 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 @@ -3154,6 +3175,12 @@ 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 diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 6b036e04efd..ff977cdedef 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -45,13 +45,7 @@ const WINDOWS_SKIP_TAGS = new Set([ 'auth', 'load_balancer', 'socks5-csfle', - 'oidc', - - // TODO: NODE-7356: enable skipped tests on windows - 'latest', - 'socks5', - 'socks5-tls', - 'tls-support-latest' + 'oidc' ]); const TASKS = [];