Skip to content

Commit 47f87bd

Browse files
benjirewisBenjamin Rewis
authored andcommitted
GODRIVER-1882 Use new AWS setup script in Evergreen (#587)
1 parent 2b75302 commit 47f87bd

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

.evergreen/config.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ functions:
533533
script: |
534534
${PREPARE_SHELL}
535535
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
536+
. ./activate_venv.sh
536537
mongo aws_e2e_regular_aws.js
537538
- command: shell.exec
538539
type: test
@@ -561,15 +562,8 @@ functions:
561562
working_dir: "src"
562563
script: |
563564
${PREPARE_SHELL}
564-
# The aws_e2e_assume_role script requires python3 with boto3.
565-
virtualenv -p ${PYTHON3} mongovenv
566-
if [ "Windows_NT" = "$OS" ]; then
567-
. mongovenv/Scripts/activate
568-
else
569-
. mongovenv/bin/activate
570-
fi
571-
pip install boto3
572565
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
566+
. ./activate_venv.sh
573567
mongo aws_e2e_assume_role.js
574568
- command: shell.exec
575569
type: test
@@ -604,25 +598,20 @@ functions:
604598
working_dir: "src"
605599
script: |
606600
${PREPARE_SHELL}
607-
if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
601+
if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
608602
echo "This platform does not support the EC2 auth test, skipping..."
609603
exit 0
610604
fi
611-
# The mongovenv was created earlier in run-aws-auth-test-with-assume-role-credentials.
612-
if [ "Windows_NT" = "$OS" ]; then
613-
. mongovenv/Scripts/activate
614-
else
615-
. mongovenv/bin/activate
616-
fi
617605
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
606+
. ./activate_venv.sh
618607
mongo aws_e2e_ec2.js
619608
- command: shell.exec
620609
type: test
621610
params:
622611
working_dir: "src"
623612
script: |
624613
${PREPARE_SHELL}
625-
if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
614+
if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
626615
exit 0
627616
fi
628617
${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
@@ -676,7 +665,7 @@ functions:
676665
working_dir: src/go.mongodb.org/mongo-driver
677666
script: |
678667
${PREPARE_SHELL}
679-
if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
668+
if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
680669
echo "This platform does not support the ECS auth test, skipping..."
681670
exit 0
682671
fi
@@ -687,7 +676,7 @@ functions:
687676
working_dir: "src"
688677
script: |
689678
${PREPARE_SHELL}
690-
if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
679+
if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
691680
exit 0
692681
fi
693682
AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -698,6 +687,7 @@ functions:
698687
cp ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
699688
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
700689
cd $AUTH_AWS_DIR
690+
. ./activate_venv.sh
701691
cat <<EOF > setup.js
702692
const mongo_binaries = "$MONGODB_BINARIES";
703693
const project_dir = "$ECS_SRC_DIR";

0 commit comments

Comments
 (0)