From 12f2378254acc2c0d0d7da92451bbf4f0096abd0 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Wed, 9 Feb 2022 14:42:29 +0100
Subject: [PATCH] test(NODE-3777): split out csfle config

---
 .evergreen/config.yml                  | 20 +++++++++++++++++---
 .evergreen/generate_evergreen_tasks.js | 26 ++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 8b804a61a8c..682729d02bd 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1764,7 +1764,7 @@ tasks:
         vars:
           VERSION: '5.0'
           TOPOLOGY: server
-      - func: bootstrap kms servers
+          AUTH: auth
       - func: run custom csfle tests
   - name: run-custom-snappy-tests
     tags:
@@ -1777,7 +1777,7 @@ tasks:
         vars:
           VERSION: '5.0'
           TOPOLOGY: server
-      - func: bootstrap kms servers
+          AUTH: auth
       - func: run custom snappy tests
   - name: run-bson-ext-test
     tags:
@@ -1790,10 +1790,23 @@ tasks:
         vars:
           VERSION: '5.0'
           TOPOLOGY: server
-      - func: bootstrap kms servers
+          AUTH: auth
       - func: run bson-ext test
         vars:
           NODE_LTS_NAME: erbium
+  - name: run-custom-csfle-tests
+    tags:
+      - run-custom-dependency-tests
+    commands:
+      - func: install dependencies
+        vars:
+          NODE_LTS_NAME: erbium
+      - func: bootstrap mongo-orchestration
+        vars:
+          VERSION: latest
+          TOPOLOGY: server
+      - func: bootstrap kms servers
+      - func: run custom csfle tests
   - name: test-latest-server-noauth
     tags:
       - latest
@@ -2346,6 +2359,7 @@ buildvariants:
       - 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
index 2e7de80a91e..cd57cbc87fe 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -664,14 +664,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('-'),