test(NODE-3777): split out csfle config

mongodb · Feb 9, 2022 · 2f1c62a · 2f1c62a
1 parent 0635969
commit 2f1c62a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 15 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1753,7 +1753,7 @@ tasks:
         vars:
           NODE_LTS_NAME: fermium
       - func: run mongosh integration tests
-  - name: run-custom-csfle-tests
+  - name: run-custom-snappy-tests
     tags:
       - run-custom-dependency-tests
     commands:
@@ -1764,9 +1764,9 @@ tasks:
         vars:
           VERSION: '5.0'
           TOPOLOGY: server
-      - func: bootstrap kms servers
-      - func: run custom csfle tests
-  - name: run-custom-snappy-tests
+          AUTH: auth
+      - func: run custom snappy tests
+  - name: run-bson-ext-test
     tags:
       - run-custom-dependency-tests
     commands:
@@ -1777,9 +1777,11 @@ tasks:
         vars:
           VERSION: '5.0'
           TOPOLOGY: server
-      - func: bootstrap kms servers
-      - func: run custom snappy tests
-  - name: run-bson-ext-test
+          AUTH: auth
+      - func: run bson-ext test
+        vars:
+          NODE_LTS_NAME: erbium
+  - name: run-custom-csfle-tests
     tags:
       - run-custom-dependency-tests
     commands:
@@ -1788,12 +1790,10 @@ tasks:
           NODE_LTS_NAME: erbium
       - func: bootstrap mongo-orchestration
         vars:
-          VERSION: '5.0'
+          VERSION: latest
           TOPOLOGY: server
       - func: bootstrap kms servers
-      - func: run bson-ext test
-        vars:
-          NODE_LTS_NAME: erbium
+      - func: run custom csfle tests
   - name: test-latest-server-noauth
     tags:
       - latest
@@ -2343,9 +2343,9 @@ buildvariants:
     display_name: Custom Dependency Version Test
     run_on: ubuntu1804-large
     tasks:
-      - run-custom-csfle-tests
       - run-custom-snappy-tests
       - run-bson-ext-test
+      - run-custom-csfle-tests
   - name: ubuntu1804-test-serverless
     display_name: Serverless Test
     run_on: ubuntu1804-test

diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -640,7 +640,6 @@ BUILD_VARIANTS.push({
 });
 
 const oneOffFuncs = [
-  { func: 'run custom csfle tests' },
   { func: 'run custom snappy tests' },
   {
     func: 'run bson-ext test',
@@ -664,14 +663,36 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
       func: 'bootstrap mongo-orchestration',
       vars: {
         VERSION: '5.0',
-        TOPOLOGY: 'server'
+        TOPOLOGY: 'server',
+        AUTH: 'auth'
       }
     },
-    { func: 'bootstrap kms servers' },
     oneOffFunc
   ]
 }));
 
+oneOffFuncAsTasks.push({
+  name: 'run-custom-csfle-tests',
+  tags: ['run-custom-dependency-tests'],
+  commands: [
+    {
+      func: 'install dependencies',
+      vars: {
+        NODE_LTS_NAME: LOWEST_LTS
+      }
+    },
+    {
+      func: 'bootstrap mongo-orchestration',
+      vars: {
+        VERSION: 'latest',
+        TOPOLOGY: 'server'
+      }
+    },
+    { func: 'bootstrap kms servers' },
+    { func: 'run custom csfle tests' }
+  ]
+});
+
 // TODO NODE-3897 - generate combined coverage report
 const coverageTask = {
   name: 'download and merge coverage'.split(' ').join('-'),