test: use subprocess

mongodb · May 31, 2023 · 24b52a4 · 24b52a4
1 parent 46de146
commit 24b52a4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
@@ -1234,17 +1234,17 @@ tasks:
   - name: "oidc-auth-test-azure-latest"
     commands:
       - func: "install dependencies"
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: bash
-          script: |-
-            set -o errexit
-            ${PREPARE_SHELL}
-            cd src
-            export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
-            tar czf $AZUREOIDC_DRIVERS_TAR_FILE .
-            export AZUREOIDC_TEST_CMD="source ./env.sh && PROVIDER_NAME=azure ./.evergreen/run-oidc-tests.sh"
-            bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
+          working_dir: src
+          binary: bash
+          env:
+            DRIVERS_TOOLS: ${DRIVERS_TOOLS}
+            PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
+            AZUREOIDC_CLIENTID: ${testazureoidc_clientid}
+            PROVIDER_NAME: azure
+          args:
+          - .evergreen/run-oidc-tests-azure.sh
 
 task_groups:
   - name: serverless_task_group

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1160,17 +1160,17 @@ tasks:
   - name: oidc-auth-test-azure-latest
     commands:
       - func: install dependencies
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: bash
-          script: |-
-            set -o errexit
-            ${PREPARE_SHELL}
-            cd src
-            export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
-            tar czf $AZUREOIDC_DRIVERS_TAR_FILE .
-            export AZUREOIDC_TEST_CMD="source ./env.sh && PROVIDER_NAME=azure ./.evergreen/run-oidc-tests.sh"
-            bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
+          working_dir: src
+          binary: bash
+          env:
+            DRIVERS_TOOLS: ${DRIVERS_TOOLS}
+            PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
+            AZUREOIDC_CLIENTID: ${testazureoidc_clientid}
+            PROVIDER_NAME: azure
+          args:
+            - .evergreen/run-oidc-tests-azure.sh
   - name: test-latest-server
     tags:
       - latest

diff --git a/.evergreen/run-oidc-tests-azure.sh b/.evergreen/run-oidc-tests-azure.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
+tar czf $AZUREOIDC_DRIVERS_TAR_FILE .
+export AZUREOIDC_TEST_CMD="source ./env.sh && PROVIDER_NAME=azure ./.evergreen/run-oidc-tests.sh"
+export AZUREOIDC_CLIENTID=$AZUREOIDC_CLIENTID
+export PROJECT_DIRECTORY=$PROJECT_DIRECTORY
+export PROVIDER_NAME=$PROVIDER_NAME
+bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh