@@ -598,12 +598,14 @@ functions:
598
598
- command : shell.exec
599
599
type : test
600
600
params :
601
+ shell : " bash"
601
602
working_dir : " src"
602
603
script : |
603
604
${PREPARE_SHELL}
605
+ set -ex
604
606
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
607
609
- command : shell.exec
608
610
type : test
609
611
params :
@@ -628,12 +630,14 @@ functions:
628
630
- command : shell.exec
629
631
type : test
630
632
params :
633
+ shell : " bash"
631
634
working_dir : " src"
632
635
script : |
633
636
${PREPARE_SHELL}
637
+ set -ex
634
638
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
637
641
- command : shell.exec
638
642
type : test
639
643
params :
@@ -665,15 +669,17 @@ functions:
665
669
type : test
666
670
params :
667
671
working_dir : " src"
672
+ shell : " bash"
668
673
script : |
669
674
${PREPARE_SHELL}
670
675
if [ "${skip_EC2_auth_test}" = "true" ]; then
671
676
echo "This platform does not support the EC2 auth test, skipping..."
672
677
exit 0
673
678
fi
679
+ set -ex
674
680
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
677
683
- command : shell.exec
678
684
type : test
679
685
params :
@@ -694,15 +700,17 @@ functions:
694
700
type : test
695
701
params :
696
702
working_dir : " src"
703
+ shell : " bash"
697
704
script : |
698
705
${PREPARE_SHELL}
699
706
if [ "${skip_EC2_auth_test}" = "true" ]; then
700
707
echo "This platform does not support the web identity auth test, skipping..."
701
708
exit 0
702
709
fi
710
+ set -ex
703
711
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
706
714
- command : shell.exec
707
715
type : test
708
716
params :
@@ -857,21 +865,20 @@ functions:
857
865
- command : shell.exec
858
866
type : test
859
867
params :
868
+ shell : " bash"
860
869
working_dir : " src"
861
870
script : |
862
871
${PREPARE_SHELL}
863
872
if [ "${skip_ECS_auth_test}" = "true" ]; then
864
873
echo "This platform does not support the ECS auth test, skipping..."
865
874
exit 0
866
875
fi
876
+ set -ex
867
877
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
875
882
cd -
876
883
877
884
" cleanup " :
@@ -2328,6 +2335,12 @@ axes:
2328
2335
batchtime : 10080 # 7 days
2329
2336
variables :
2330
2337
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
2331
2344
- id : rhel83-zseries
2332
2345
display_name : " RHEL 8.3 (zSeries)"
2333
2346
run_on : rhel83-zseries-small
@@ -3188,7 +3201,7 @@ buildvariants:
3188
3201
3189
3202
- matrix_name : " aws-auth-test"
3190
3203
matrix_spec :
3191
- platform : [ubuntu-20 .04]
3204
+ platform : [ubuntu-18 .04]
3192
3205
python-version : ["3.7"]
3193
3206
display_name : " MONGODB-AWS Auth ${platform} ${python-version}"
3194
3207
tasks :
0 commit comments