@@ -598,12 +598,14 @@ functions:
598598 - command : shell.exec
599599 type : test
600600 params :
601+ shell : " bash"
601602 working_dir : " src"
602603 script : |
603604 ${PREPARE_SHELL}
605+ set -ex
604606 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
605- . ./activate_venv .sh
606- mongo aws_e2e_regular_aws.js
607+ . ./activate-authawsvenv .sh
608+ python aws_tester.py regular
607609 - command : shell.exec
608610 type : test
609611 params :
@@ -628,12 +630,14 @@ functions:
628630 - command : shell.exec
629631 type : test
630632 params :
633+ shell : " bash"
631634 working_dir : " src"
632635 script : |
633636 ${PREPARE_SHELL}
637+ set -ex
634638 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
635- . ./activate_venv .sh
636- mongo aws_e2e_assume_role.js
639+ . ./activate-authawsvenv .sh
640+ python aws_tester.py assume-role
637641 - command : shell.exec
638642 type : test
639643 params :
@@ -665,15 +669,17 @@ functions:
665669 type : test
666670 params :
667671 working_dir : " src"
672+ shell : " bash"
668673 script : |
669674 ${PREPARE_SHELL}
670675 if [ "${skip_EC2_auth_test}" = "true" ]; then
671676 echo "This platform does not support the EC2 auth test, skipping..."
672677 exit 0
673678 fi
679+ set -ex
674680 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
675- . ./activate_venv .sh
676- mongo aws_e2e_ec2.js
681+ . ./activate-authawsvenv .sh
682+ python aws_tester.py ec2
677683 - command : shell.exec
678684 type : test
679685 params :
@@ -694,15 +700,17 @@ functions:
694700 type : test
695701 params :
696702 working_dir : " src"
703+ shell : " bash"
697704 script : |
698705 ${PREPARE_SHELL}
699706 if [ "${skip_EC2_auth_test}" = "true" ]; then
700707 echo "This platform does not support the web identity auth test, skipping..."
701708 exit 0
702709 fi
710+ set -ex
703711 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
704- . ./activate_venv .sh
705- mongo aws_e2e_web_identity.js
712+ . ./activate-authawsvenv .sh
713+ python aws_tester.py web-identity
706714 - command : shell.exec
707715 type : test
708716 params :
@@ -857,21 +865,20 @@ functions:
857865 - command : shell.exec
858866 type : test
859867 params :
868+ shell : " bash"
860869 working_dir : " src"
861870 script : |
862871 ${PREPARE_SHELL}
863872 if [ "${skip_ECS_auth_test}" = "true" ]; then
864873 echo "This platform does not support the ECS auth test, skipping..."
865874 exit 0
866875 fi
876+ set -ex
867877 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
868- . ./activate_venv.sh
869- cat <<EOF > setup.js
870- const mongo_binaries = "$MONGODB_BINARIES";
871- const project_dir = "$PROJECT_DIRECTORY";
872- EOF
873-
874- mongo --nodb setup.js aws_e2e_ecs.js
878+ . ./activate-authawsvenv.sh
879+ export MONGODB_BINARIES="${MONGODB_BINARIES}";
880+ export PROJECT_DIRECTORY="${PROJECT_DIRECTORY}";
881+ python aws_tester.py ecs
875882 cd -
876883
877884 " cleanup " :
@@ -2328,6 +2335,12 @@ axes:
23282335 batchtime : 10080 # 7 days
23292336 variables :
23302337 python3_binary : python3
2338+ - id : ubuntu-18.04
2339+ display_name : " Ubuntu 18.04"
2340+ run_on : ubuntu1804-small
2341+ batchtime : 10080 # 7 days
2342+ variables :
2343+ python3_binary : python3
23312344 - id : rhel83-zseries
23322345 display_name : " RHEL 8.3 (zSeries)"
23332346 run_on : rhel83-zseries-small
@@ -3188,7 +3201,7 @@ buildvariants:
31883201
31893202- matrix_name : " aws-auth-test"
31903203 matrix_spec :
3191- platform : [ubuntu-20 .04]
3204+ platform : [ubuntu-18 .04]
31923205 python-version : ["3.7"]
31933206 display_name : " MONGODB-AWS Auth ${platform} ${python-version}"
31943207 tasks :
0 commit comments