pr feedback: pare down the list of nodeless tasks

Author: PavelSafronov

.evergreen/config.yml

@@ -3725,60 +3725,6 @@ buildvariants:
       - test-tls-support-5.0
       - test-tls-support-4.4
       - test-tls-support-4.2
-  - name: rhel80-large-nodeless
-    display_name: rhel8 Nodeless
-    run_on: rhel80-large
-    expansions:
-      MONGODB_BUNDLED: true
-      NODE_LTS_VERSION: latest
-      CLIENT_ENCRYPTION: true
-    tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
-      - test-rapid-server
-      - test-rapid-replica_set
-      - test-rapid-sharded_cluster
-      - test-8.0-server
-      - test-8.0-replica_set
-      - test-8.0-sharded_cluster
-      - test-7.0-server
-      - test-7.0-replica_set
-      - test-7.0-sharded_cluster
-      - test-6.0-server
-      - test-6.0-replica_set
-      - test-6.0-sharded_cluster
-      - test-5.0-server
-      - test-5.0-replica_set
-      - test-5.0-sharded_cluster
-      - test-4.4-server
-      - test-4.4-replica_set
-      - test-4.4-sharded_cluster
-      - test-4.2-server
-      - test-4.2-replica_set
-      - test-4.2-sharded_cluster
-      - test-latest-server-v1-api
-      - test-x509-authentication
-      - test-atlas-connectivity
-      - test-5.0-load-balanced
-      - test-6.0-load-balanced
-      - test-7.0-load-balanced
-      - test-8.0-load-balanced
-      - test-rapid-load-balanced
-      - test-latest-load-balanced
-      - test-auth-kerberos
-      - test-auth-ldap
-      - test-socks5-csfle
-      - 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-2022-latest-large-iron
     display_name: Windows Node20.19.0
     run_on: windows-2022-latest-large
@@ -3911,49 +3857,6 @@ buildvariants:
       - test-tls-support-5.0
       - test-tls-support-4.4
       - test-tls-support-4.2
-  - name: windows-2022-latest-large-nodeless
-    display_name: Windows Nodeless
-    run_on: windows-2022-latest-large
-    expansions:
-      MONGODB_BUNDLED: true
-      NODE_LTS_VERSION: latest
-      CLIENT_ENCRYPTION: false
-    tasks:
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
-      - test-rapid-server
-      - test-rapid-replica_set
-      - test-rapid-sharded_cluster
-      - test-8.0-server
-      - test-8.0-replica_set
-      - test-8.0-sharded_cluster
-      - test-7.0-server
-      - test-7.0-replica_set
-      - test-7.0-sharded_cluster
-      - test-6.0-server
-      - test-6.0-replica_set
-      - test-6.0-sharded_cluster
-      - test-5.0-server
-      - test-5.0-replica_set
-      - test-5.0-sharded_cluster
-      - test-4.4-server
-      - test-4.4-replica_set
-      - test-4.4-sharded_cluster
-      - test-4.2-server
-      - test-4.2-replica_set
-      - test-4.2-sharded_cluster
-      - test-latest-server-v1-api
-      - 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: rhel8-node20.19.0-test-csfle-mongocryptd
     display_name: rhel 8 Node20.19.0 test mongocryptd
     run_on: rhel80-large
@@ -4116,3 +4019,47 @@ buildvariants:
     run_on: rhel80-large
     tasks:
       - .ssl
+  - name: rhel8-nodeless
+    display_name: Nodeless
+    run_on: rhel80-large
+    tasks:
+      - test-latest-server
+      - test-latest-replica_set
+      - test-latest-sharded_cluster
+      - test-rapid-server
+      - test-rapid-replica_set
+      - test-rapid-sharded_cluster
+      - 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
+      - test-snappy-compression
+      - test-zstd-compression
+      - test-tls-support-latest
+  - name: windows-nodeless
+    display_name: Windows Nodeless
+    run_on: windows-2022-latest-large
+    tasks:
+      - test-latest-server
+      - test-latest-replica_set
+      - test-latest-sharded_cluster
+      - test-rapid-server
+      - test-rapid-replica_set
+      - test-rapid-sharded_cluster
+      - 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
+      - test-snappy-compression
+      - test-zstd-compression
+      - test-tls-support-latest

.evergreen/generate_evergreen_tasks.js

@@ -417,20 +417,6 @@ for (const {
     }
     BUILD_VARIANTS.push(buildVariantData);
   }
-
-  // add Node-less variant
-  const buildVariantData = {
-    name: `${osName}-nodeless`,
-    display_name: `${osDisplayName} Nodeless`,
-    run_on,
-    expansions: {
-      MONGODB_BUNDLED: true,
-      NODE_LTS_VERSION: 'latest'
-    },
-    tasks: tasks.map(({ name }) => name)
-  };
-  buildVariantData.expansions.CLIENT_ENCRYPTION = clientEncryption;
-  BUILD_VARIANTS.push(buildVariantData);
 }
 
 // Running CSFLE tests with mongocryptd
@@ -826,6 +812,40 @@ BUILD_VARIANTS.push({
   tasks: ['.ssl']
 });
 
+// small subset of tests to run on nodeless environments
+const nodelessTasks = [
+  'test-latest-server',
+  'test-latest-replica_set',
+  'test-latest-sharded_cluster',
+  'test-rapid-server',
+  'test-rapid-replica_set',
+  'test-rapid-sharded_cluster',
+  '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',
+  'test-snappy-compression',
+  'test-zstd-compression',
+  'test-tls-support-latest',
+]
+BUILD_VARIANTS.push({
+  name: 'rhel8-nodeless',
+  display_name: 'Nodeless',
+  run_on: DEFAULT_OS,
+  tasks: nodelessTasks
+});
+BUILD_VARIANTS.push({
+  name: 'windows-nodeless',
+  display_name: 'Windows Nodeless',
+  run_on: WINDOWS_OS,
+  tasks: nodelessTasks
+});
+
 // TODO(NODE-4897): Debug socks5 tests on node latest
 for (const variant of BUILD_VARIANTS.filter(
   variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_VERSION)