Skip to content

Commit 9584639

Browse files
committed
test: use new evergreen scripts
1 parent 64dc577 commit 9584639

File tree

3 files changed

+124
-112
lines changed

3 files changed

+124
-112
lines changed

.evergreen/config.in.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,10 @@ functions:
669669
shell: bash
670670
script: |
671671
${PREPARE_SHELL}
672+
set -ex
672673
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
673674
. ./activate-authawsvenv.sh
674-
${MONGODB_BINARIES}/mongo aws_e2e_regular_aws.js
675+
python aws_tester.py regular
675676
- command: shell.exec
676677
type: test
677678
params:
@@ -700,9 +701,10 @@ functions:
700701
shell: bash
701702
script: |
702703
${PREPARE_SHELL}
704+
set -ex
703705
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
704706
. ./activate-authawsvenv.sh
705-
${MONGODB_BINARIES}/mongo aws_e2e_assume_role.js
707+
python aws_tester.py assume-role
706708
- command: shell.exec
707709
type: test
708710
params:
@@ -738,9 +740,10 @@ functions:
738740
# Write an empty prepare_mongodb_aws so no auth environment variables
739741
# are set.
740742
echo "" > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
743+
set -ex
741744
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
742745
. ./activate-authawsvenv.sh
743-
${MONGODB_BINARIES}/mongo aws_e2e_ec2.js
746+
python aws_tester.py ec2
744747
- command: shell.exec
745748
type: test
746749
params:
@@ -757,8 +760,10 @@ functions:
757760
working_dir: "src"
758761
silent: true
759762
script: |
763+
set -ex
760764
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
761-
${MONGODB_BINARIES}/mongo --verbose aws_e2e_regular_aws.js
765+
. ./activate-authawsvenv.sh
766+
python aws_tester.py regular
762767
cd -
763768
cat <<EOF > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
764769
export AWS_ACCESS_KEY_ID=${iam_auth_ecs_account}
@@ -780,8 +785,10 @@ functions:
780785
working_dir: "src"
781786
silent: true
782787
script: |
788+
set -ex
783789
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
784-
${MONGODB_BINARIES}/mongo --verbose aws_e2e_assume_role.js
790+
. ./activate-authawsvenv.sh
791+
python aws_tester.py assume-role
785792
cd -
786793
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
787794
export AWS_ACCESS_KEY_ID=$(jq -r '.AccessKeyId' ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json)
@@ -804,9 +811,10 @@ functions:
804811
working_dir: "src"
805812
silent: true
806813
script: |
814+
set -ex
807815
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
808-
. ./activate_venv.sh
809-
${MONGODB_BINARIES}/mongo --verbose aws_e2e_web_identity.js
816+
. ./activate-authawsvenv.sh
817+
python aws_tester.py web-identity
810818
cd -
811819
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
812820
export AWS_WEB_IDENTITY_TOKEN_FILE=${iam_web_identity_token_file}
@@ -829,9 +837,10 @@ functions:
829837
working_dir: "src"
830838
silent: true
831839
script: |
840+
set -ex
832841
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
833-
. ./activate_venv.sh
834-
${MONGODB_BINARIES}/mongo --verbose aws_e2e_web_identity.js
842+
. ./activate-authawsvenv.sh
843+
python aws_tester.py web-identity
835844
cd -
836845
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
837846
export AWS_WEB_IDENTITY_TOKEN_FILE=${iam_web_identity_token_file}
@@ -865,15 +874,12 @@ functions:
865874
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
866875
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
867876
877+
set -ex
868878
cd $AUTH_AWS_DIR
869-
cat <<EOF > setup.js
870-
const mongo_binaries = "$MONGODB_BINARIES";
871-
const project_dir = "$ECS_SRC_DIR";
872-
EOF
873-
874-
cat setup.js
875879
. ./activate-authawsvenv.sh
876-
${MONGODB_BINARIES}/mongo --nodb setup.js aws_e2e_ecs.js
880+
export MONGODB_BINARIES="${MONGODB_BINARIES}";
881+
export PROJECT_DIRECTORY="${PROJECT_DIRECTORY}";
882+
python aws_tester.py ecs
877883
878884
"run-ocsp-test":
879885
- command: shell.exec

0 commit comments

Comments
 (0)