From fe586669de101e5fbab7e172165e358a440a8df6 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Thu, 15 Dec 2022 11:46:58 -0500
Subject: [PATCH] test(NODE-4800): update build env scripts

---
 .evergreen/config.in.yml      | 15 ++++++++++-----
 .evergreen/config.yml         | 15 ++++++++++-----
 .evergreen/run-kms-servers.sh |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
index 5fa63fea913..3ad36514e51 100644
--- a/.evergreen/config.in.yml
+++ b/.evergreen/config.in.yml
@@ -527,10 +527,11 @@ functions:
       type: test
       params:
         working_dir: "src"
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           cd -
 
   "run aws auth test with regular aws credentials":
@@ -538,10 +539,11 @@ functions:
       type: test
       params:
         working_dir: "src"
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_regular_aws.js
     - command: shell.exec
       type: test
@@ -568,10 +570,11 @@ functions:
       type: test
       params:
         working_dir: "src"
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_assume_role.js
     - command: shell.exec
       type: test
@@ -602,13 +605,14 @@ functions:
       type: test
       params:
         working_dir: "src"
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           # Write an empty prepare_mongodb_aws so no auth environment variables
           # are set.
           echo "" > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_ec2.js
     - command: shell.exec
       type: test
@@ -671,6 +675,7 @@ functions:
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -691,7 +696,7 @@ functions:
           EOF
 
           cat setup.js
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo --nodb setup.js aws_e2e_ecs.js
 
   "run-ocsp-test":
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 604c871e247..de7e2b15e7e 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -490,20 +490,22 @@ functions:
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           cd -
   run aws auth test with regular aws credentials:
     - command: shell.exec
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_regular_aws.js
     - command: shell.exec
       type: test
@@ -529,10 +531,11 @@ functions:
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_assume_role.js
     - command: shell.exec
       type: test
@@ -562,13 +565,14 @@ functions:
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           # Write an empty prepare_mongodb_aws so no auth environment variables
           # are set.
           echo "" > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo aws_e2e_ec2.js
     - command: shell.exec
       type: test
@@ -628,6 +632,7 @@ functions:
       type: test
       params:
         working_dir: src
+        shell: bash
         script: |
           ${PREPARE_SHELL}
           AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -648,7 +653,7 @@ functions:
           EOF
 
           cat setup.js
-          . ./activate_venv.sh
+          . ./activate-authawsvenv.sh
           ${MONGODB_BINARIES}/mongo --nodb setup.js aws_e2e_ecs.js
   run-ocsp-test:
     - command: shell.exec
diff --git a/.evergreen/run-kms-servers.sh b/.evergreen/run-kms-servers.sh
index 76ef6ac258e..44fa5dd7f8b 100644
--- a/.evergreen/run-kms-servers.sh
+++ b/.evergreen/run-kms-servers.sh
@@ -1,5 +1,5 @@
 cd ${DRIVERS_TOOLS}/.evergreen/csfle
-. ./activate_venv.sh
+. ./activate-kmstlsvenv.sh
 # by default it always runs on port 5698
 ./kmstlsvenv/bin/python3 -u kms_kmip_server.py &
 ./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &