Skip to content

Commit d69da74

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

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
@@ -463,6 +463,7 @@ functions:
463463
script: |
464464
${PREPARE_SHELL}
465465
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
466+
. ./activate_venv.sh
466467
mongo aws_e2e_regular_aws.js
467468
- command: shell.exec
468469
type: test
@@ -491,15 +492,8 @@ functions:
491492
working_dir: "src"
492493
script: |
493494
${PREPARE_SHELL}
494-
# The aws_e2e_assume_role script requires python3 with boto3.
495-
virtualenv -p ${python3_binary} mongovenv
496-
if [ "Windows_NT" = "$OS" ]; then
497-
. mongovenv/Scripts/activate
498-
else
499-
. mongovenv/bin/activate
500-
fi
501-
pip install --upgrade boto3
502495
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
496+
. ./activate_venv.sh
503497
mongo aws_e2e_assume_role.js
504498
- command: shell.exec
505499
type: test
@@ -538,13 +532,8 @@ functions:
538532
echo "This platform does not support the EC2 auth test, skipping..."
539533
exit 0
540534
fi
541-
# The mongovenv was created earlier in "run aws auth test with assume role credentials".
542-
if [ "Windows_NT" = "$OS" ]; then
543-
. mongovenv/Scripts/activate
544-
else
545-
. mongovenv/bin/activate
546-
fi
547535
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
536+
. ./activate_venv.sh
548537
mongo aws_e2e_ec2.js
549538
- command: shell.exec
550539
type: test
@@ -607,13 +596,8 @@ functions:
607596
echo "This platform does not support the ECS auth test, skipping..."
608597
exit 0
609598
fi
610-
# The mongovenv was created earlier in "run aws auth test with assume role credentials".
611-
if [ "Windows_NT" = "$OS" ]; then
612-
. mongovenv/Scripts/activate
613-
else
614-
. mongovenv/bin/activate
615-
fi
616599
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
600+
. ./activate_venv.sh
617601
cat <<EOF > setup.js
618602
const mongo_binaries = "$MONGODB_BINARIES";
619603
const project_dir = "$PROJECT_DIRECTORY";

0 commit comments

Comments
 (0)