Skip to content

Commit 737e74e

Browse files
committed
fix usage of scripts
1 parent 3170cfa commit 737e74e

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

.evergreen/config.in.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,10 @@ functions:
227227
# Get access to the AWS temporary credentials:
228228
echo "adding temporary AWS credentials to environment"
229229
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
230-
. "$DRIVERS_TOOLS"/.evergreen/csfle/activate-kmstlsvenv.sh
231-
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
230+
pushd "$DRIVERS_TOOLS"/.evergreen/csfle
231+
. ./activate-kmstlsvenv.sh
232+
. ./set-temp-creds.sh
233+
popd
232234
233235
MONGODB_URI="${MONGODB_URI}" \
234236
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \

.evergreen/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,10 @@ functions:
199199
# Get access to the AWS temporary credentials:
200200
echo "adding temporary AWS credentials to environment"
201201
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
202-
. "$DRIVERS_TOOLS"/.evergreen/csfle/activate-kmstlsvenv.sh
203-
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
202+
pushd "$DRIVERS_TOOLS"/.evergreen/csfle
203+
. ./activate-kmstlsvenv.sh
204+
. ./set-temp-creds.sh
205+
popd
204206
205207
MONGODB_URI="${MONGODB_URI}" \
206208
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \

.evergreen/run-custom-csfle-tests.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ set -o errexit # Exit the script with error if any of the commands fail
2020
# Get access to the AWS temporary credentials:
2121
echo "adding temporary AWS credentials to environment"
2222
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
23-
. "$DRIVERS_TOOLS"/.evergreen/csfle/activate-kmstlsvenv.sh
24-
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
23+
pushd "$DRIVERS_TOOLS"/.evergreen/csfle
24+
. ./activate-kmstlsvenv.sh
25+
. ./set-temp-creds.sh
26+
popd
2527

2628
export MONGODB_URI=${MONGODB_URI}
2729
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"

.evergreen/run-socks5-tests.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ function setup_fle() {
1818
# Get access to the AWS temporary credentials:
1919
echo "adding temporary AWS credentials to environment"
2020
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
21-
. "$DRIVERS_TOOLS"/.evergreen/csfle/activate-kmstlsvenv.sh
22-
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
21+
pushd "$DRIVERS_TOOLS"/.evergreen/csfle
22+
. ./activate-kmstlsvenv.sh
23+
. ./set-temp-creds.sh
24+
popd
2325

2426
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
2527
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"

0 commit comments

Comments
 (0)