Skip to content

Commit d16874f

Browse files
committed
PYTHON-2445 Use new setup script for MONGODB-AWS testing
(cherry picked from commit 7ca1efd)
1 parent ba3d322 commit d16874f

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

.evergreen/config.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ functions:
506506
script: |
507507
${PREPARE_SHELL}
508508
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
509+
. ./activate_venv.sh
509510
mongo aws_e2e_regular_aws.js
510511
- command: shell.exec
511512
type: test
@@ -534,15 +535,8 @@ functions:
534535
working_dir: "src"
535536
script: |
536537
${PREPARE_SHELL}
537-
# The aws_e2e_assume_role script requires python3 with boto3.
538-
virtualenv -p ${python3_binary} mongovenv
539-
if [ "Windows_NT" = "$OS" ]; then
540-
. mongovenv/Scripts/activate
541-
else
542-
. mongovenv/bin/activate
543-
fi
544-
pip install --upgrade boto3
545538
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
539+
. ./activate_venv.sh
546540
mongo aws_e2e_assume_role.js
547541
- command: shell.exec
548542
type: test
@@ -581,13 +575,8 @@ functions:
581575
echo "This platform does not support the EC2 auth test, skipping..."
582576
exit 0
583577
fi
584-
# The mongovenv was created earlier in "run aws auth test with assume role credentials".
585-
if [ "Windows_NT" = "$OS" ]; then
586-
. mongovenv/Scripts/activate
587-
else
588-
. mongovenv/bin/activate
589-
fi
590578
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
579+
. ./activate_venv.sh
591580
mongo aws_e2e_ec2.js
592581
- command: shell.exec
593582
type: test
@@ -650,13 +639,8 @@ functions:
650639
echo "This platform does not support the ECS auth test, skipping..."
651640
exit 0
652641
fi
653-
# The mongovenv was created earlier in "run aws auth test with assume role credentials".
654-
if [ "Windows_NT" = "$OS" ]; then
655-
. mongovenv/Scripts/activate
656-
else
657-
. mongovenv/bin/activate
658-
fi
659642
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
643+
. ./activate_venv.sh
660644
cat <<EOF > setup.js
661645
const mongo_binaries = "$MONGODB_BINARIES";
662646
const project_dir = "$PROJECT_DIRECTORY";

0 commit comments

Comments
 (0)