Skip to content

Commit ccdaffc

Browse files
benjirewisBenjamin Rewis
authored andcommitted
GODRIVER-1882 Use new AWS setup script in Evergreen (#587)
1 parent 7087b5e commit ccdaffc

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
@@ -570,6 +570,7 @@ functions:
570570
script: |
571571
${PREPARE_SHELL}
572572
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
573+
. ./activate_venv.sh
573574
mongo aws_e2e_regular_aws.js
574575
- command: shell.exec
575576
type: test
@@ -598,15 +599,8 @@ functions:
598599
working_dir: "src"
599600
script: |
600601
${PREPARE_SHELL}
601-
# The aws_e2e_assume_role script requires python3 with boto3.
602-
virtualenv -p ${PYTHON3} mongovenv
603-
if [ "Windows_NT" = "$OS" ]; then
604-
. mongovenv/Scripts/activate
605-
else
606-
. mongovenv/bin/activate
607-
fi
608-
pip install boto3
609602
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
603+
. ./activate_venv.sh
610604
mongo aws_e2e_assume_role.js
611605
- command: shell.exec
612606
type: test
@@ -641,25 +635,20 @@ functions:
641635
working_dir: "src"
642636
script: |
643637
${PREPARE_SHELL}
644-
if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
638+
if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
645639
echo "This platform does not support the EC2 auth test, skipping..."
646640
exit 0
647641
fi
648-
# The mongovenv was created earlier in run-aws-auth-test-with-assume-role-credentials.
649-
if [ "Windows_NT" = "$OS" ]; then
650-
. mongovenv/Scripts/activate
651-
else
652-
. mongovenv/bin/activate
653-
fi
654642
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
643+
. ./activate_venv.sh
655644
mongo aws_e2e_ec2.js
656645
- command: shell.exec
657646
type: test
658647
params:
659648
working_dir: "src"
660649
script: |
661650
${PREPARE_SHELL}
662-
if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
651+
if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
663652
exit 0
664653
fi
665654
${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
@@ -713,7 +702,7 @@ functions:
713702
working_dir: src/go.mongodb.org/mongo-driver
714703
script: |
715704
${PREPARE_SHELL}
716-
if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
705+
if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
717706
echo "This platform does not support the ECS auth test, skipping..."
718707
exit 0
719708
fi
@@ -724,7 +713,7 @@ functions:
724713
working_dir: "src"
725714
script: |
726715
${PREPARE_SHELL}
727-
if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
716+
if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
728717
exit 0
729718
fi
730719
AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -735,6 +724,7 @@ functions:
735724
cp ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
736725
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
737726
cd $AUTH_AWS_DIR
727+
. ./activate_venv.sh
738728
cat <<EOF > setup.js
739729
const mongo_binaries = "$MONGODB_BINARIES";
740730
const project_dir = "$ECS_SRC_DIR";

0 commit comments

Comments
 (0)