changes

Author: baileympearson

.evergreen/config.yml

@@ -2105,7 +2105,23 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run socks5 tests
-  - name: test-zstd-compression
+  - name: test-snappy-compression
+    tags:
+      - latest
+      - snappy
+    commands:
+      - command: expansions.update
+        type: setup
+        params:
+          updates:
+            - {key: VERSION, value: latest}
+            - {key: TOPOLOGY, value: replica_set}
+            - {key: AUTH, value: auth}
+            - {key: COMPRESSOR, value: snappy}
+      - func: install dependencies
+      - func: bootstrap mongo-orchestration
+      - func: run-compression-tests
+  - name: test-zstd-1.x-compression
     tags:
       - latest
       - zstd
@@ -2120,11 +2136,14 @@ tasks:
             - {key: COMPRESSOR, value: zstd}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
+      - func: install package
+        vars:
+          PACKAGE: '@mongodb-js/[email protected]'
       - func: run-compression-tests
-  - name: test-snappy-compression
+  - name: test-zstd-2.x-compression
     tags:
       - latest
-      - snappy
+      - zstd
     commands:
       - command: expansions.update
         type: setup
@@ -2133,7 +2152,7 @@ tasks:
             - {key: VERSION, value: latest}
             - {key: TOPOLOGY, value: replica_set}
             - {key: AUTH, value: auth}
-            - {key: COMPRESSOR, value: snappy}
+            - {key: COMPRESSOR, value: zstd}
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: run-compression-tests
@@ -4785,6 +4804,8 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4841,6 +4862,8 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4897,6 +4920,8 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -4953,8 +4978,9 @@ buildvariants:
       - test-socks5
       - test-socks5-csfle
       - test-socks5-tls
-      - test-zstd-compression
       - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5009,8 +5035,9 @@ buildvariants:
       - test-auth-ldap
       - test-socks5-csfle
       - test-socks5-tls
-      - test-zstd-compression
       - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5055,6 +5082,8 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5099,6 +5128,8 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5143,6 +5174,8 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0
@@ -5187,8 +5220,9 @@ buildvariants:
       - test-latest-server-v1-api
       - test-socks5
       - test-socks5-tls
-      - test-zstd-compression
       - test-snappy-compression
+      - test-zstd-1.x-compression
+      - test-zstd-2.x-compression
       - test-tls-support-latest
       - test-tls-support-8.0
       - test-tls-support-7.0

.evergreen/generate_evergreen_tasks.js

@@ -211,23 +211,60 @@ TASKS.push(
   ]
 );
 
-for (const compressor of ['zstd', 'snappy']) {
-  TASKS.push({
-    name: `test-${compressor}-compression`,
-    tags: ['latest', compressor],
-    commands: [
-      updateExpansions({
-        VERSION: 'latest',
-        TOPOLOGY: 'replica_set',
-        AUTH: 'auth',
-        COMPRESSOR: compressor
-      }),
-      { func: 'install dependencies' },
-      { func: 'bootstrap mongo-orchestration' },
-      { func: 'run-compression-tests' }
-    ]
-  });
-}
+TASKS.push({
+  name: `test-snappy-compression`,
+  tags: ['latest', 'snappy'],
+  commands: [
+    updateExpansions({
+      VERSION: 'latest',
+      TOPOLOGY: 'replica_set',
+      AUTH: 'auth',
+      COMPRESSOR: 'snappy'
+    }),
+    { func: 'install dependencies' },
+    { func: 'bootstrap mongo-orchestration' },
+    { func: 'run-compression-tests' }
+  ]
+});
+
+TASKS.push({
+  name: `test-zstd-1.x-compression`,
+  tags: ['latest', 'zstd'],
+  commands: [
+    updateExpansions({
+      VERSION: 'latest',
+      TOPOLOGY: 'replica_set',
+      AUTH: 'auth',
+      COMPRESSOR: 'zstd'
+    }),
+    { func: 'install dependencies' },
+    { func: 'bootstrap mongo-orchestration' },
+    {
+      func: 'install package',
+      vars: {
+        PACKAGE: '@mongodb-js/[email protected]'
+      }
+    },
+    { func: 'run-compression-tests' }
+  ]
+});
+
+TASKS.push({
+  name: `test-zstd-2.x-compression`,
+  tags: ['latest', 'zstd'],
+  commands: [
+    updateExpansions({
+      VERSION: 'latest',
+      TOPOLOGY: 'replica_set',
+      AUTH: 'auth',
+      COMPRESSOR: 'zstd'
+    }),
+    { func: 'install dependencies' },
+    { func: 'bootstrap mongo-orchestration' },
+    // no need to manually install zstd - we specify 2.x as a dev dependency in package.json
+    { func: 'run-compression-tests' }
+  ]
+});
 
 const AWS_LAMBDA_HANDLER_TASKS = [];
 // Add task for testing lambda example without aws auth.