GODRIVER-1882 Use new AWS setup script in Evergreen (#587)

mongodb · Mar 1, 2021 · 47f87bd · 47f87bd
1 parent 2b75302
commit 47f87bd
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -533,6 +533,7 @@ functions:
         script: |
           ${PREPARE_SHELL}
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
+          . ./activate_venv.sh
           mongo aws_e2e_regular_aws.js
     - command: shell.exec
       type: test
@@ -561,15 +562,8 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          # The aws_e2e_assume_role script requires python3 with boto3.
-          virtualenv -p ${PYTHON3} mongovenv
-          if [ "Windows_NT" = "$OS" ]; then
-            . mongovenv/Scripts/activate
-          else
-            . mongovenv/bin/activate
-          fi
-          pip install boto3
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
+          . ./activate_venv.sh
           mongo aws_e2e_assume_role.js
     - command: shell.exec
       type: test
@@ -604,25 +598,20 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
+          if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
             echo "This platform does not support the EC2 auth test, skipping..."
             exit 0
           fi
-          # The mongovenv was created earlier in run-aws-auth-test-with-assume-role-credentials.
-          if [ "Windows_NT" = "$OS" ]; then
-            . mongovenv/Scripts/activate
-          else
-            . mongovenv/bin/activate
-          fi
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
+          . ./activate_venv.sh
           mongo aws_e2e_ec2.js
     - command: shell.exec
       type: test
       params:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          if [ "${SKIP_EC2_AUTH_TEST}" == "true" ]; then
+          if [ "${SKIP_EC2_AUTH_TEST}" = "true" ]; then
             exit 0
           fi
           ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
@@ -676,7 +665,7 @@ functions:
         working_dir: src/go.mongodb.org/mongo-driver
         script: |
           ${PREPARE_SHELL}
-          if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
+          if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
             echo "This platform does not support the ECS auth test, skipping..."
             exit 0
           fi
@@ -687,7 +676,7 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          if [ "${SKIP_ECS_AUTH_TEST}" == "true" ]; then
+          if [ "${SKIP_ECS_AUTH_TEST}" = "true" ]; then
             exit 0
           fi
           AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -698,6 +687,7 @@ functions:
           cp ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
           tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
           cd $AUTH_AWS_DIR
+          . ./activate_venv.sh
           cat <<EOF > setup.js
             const mongo_binaries = "$MONGODB_BINARIES";
             const project_dir = "$ECS_SRC_DIR";