gcp kms tests

Author: baileympearson

.evergreen/config.in.yml

@@ -1157,29 +1157,10 @@ tasks:
         type: setup
         params:
           binary: bash
-          add_expansions_to_env: true
           env:
             DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_GCLOUD: ${GCPKMS_GCLOUD}
-            GCPKMS_PROJECT: ${GCPKMS_PROJECT}
-            GCPKMS_ZONE: ${GCPKMS_ZONE}
-            GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
-          args:
-            - src/.evergreen/setup-gcp-testing.sh
-      # Run Mocha test over on GCE instance
-      - command: subprocess.exec
-        type: test
-        params:
-          working_dir: src
-          binary: bash
-          env:
-            GCPKMS_GCLOUD: ${GCPKMS_GCLOUD}
-            GCPKMS_PROJECT: ${GCPKMS_PROJECT}
-            GCPKMS_ZONE: ${GCPKMS_ZONE}
-            GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
-            GCPKMS_CMD: "env EXPECTED_GCPKMS_OUTCOME=success bash src/.evergreen/run-gcp-kms-tests.sh"
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh
+            - src/.evergreen/run-deployed-gcp-kms-tests.sh
 
   - name: "test-gcpkms-fail-task"
     # test-gcpkms-fail-task runs in a non-GCE environment.

.evergreen/config.yml

@@ -1116,28 +1116,10 @@ tasks:
         type: setup
         params:
           binary: bash
-          add_expansions_to_env: true
           env:
             DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_GCLOUD: ${GCPKMS_GCLOUD}
-            GCPKMS_PROJECT: ${GCPKMS_PROJECT}
-            GCPKMS_ZONE: ${GCPKMS_ZONE}
-            GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
-          args:
-            - src/.evergreen/setup-gcp-testing.sh
-      - command: subprocess.exec
-        type: test
-        params:
-          working_dir: src
-          binary: bash
-          env:
-            GCPKMS_GCLOUD: ${GCPKMS_GCLOUD}
-            GCPKMS_PROJECT: ${GCPKMS_PROJECT}
-            GCPKMS_ZONE: ${GCPKMS_ZONE}
-            GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
-            GCPKMS_CMD: env EXPECTED_GCPKMS_OUTCOME=success bash src/.evergreen/run-gcp-kms-tests.sh
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh
+            - src/.evergreen/run-deployed-gcp-kms-tests.sh
   - name: test-gcpkms-fail-task
     commands:
       - command: expansions.update

.evergreen/setup-gcp-testing.sh renamed to .evergreen/run-deployed-gcp-kms-tests.sh

@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 source "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/secrets-export.sh"
+source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 # Assert required environment variables are present without printing them
 if [ -z ${GCPKMS_GCLOUD+omitted} ]; then echo "GCPKMS_GCLOUD is unset" && exit 1; fi
@@ -10,8 +11,6 @@ if [ -z ${GCPKMS_INSTANCENAME+omitted} ]; then echo "GCPKMS_INSTANCENAME is unse
 
 set -o errexit
 
-source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
-
 export GCPKMS_SRC=node-driver-source.tgz
 export GCPKMS_DST=$GCPKMS_INSTANCENAME:
 
@@ -28,3 +27,6 @@ echo "decompressing node driver tar on gcp ... begin"
 export GCPKMS_CMD="tar -xzf $GCPKMS_SRC"
 "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh"
 echo "decompressing node driver tar on gcp ... end"
+
+export GCPKMS_CMD="env EXPECTED_GCPKMS_OUTCOME=success bash src/.evergreen/run-gcp-kms-tests.sh"
+bash ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh