Skip to content

Commit a2e0c29

Browse files
authored
Fix datalake and k8s test failures (#1732)
- Increase timeout for k8s tests. - Add explicit "assume role". - Include submodules to OIDC testing. JAVA-5885
1 parent ebdd5bf commit a2e0c29

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

.evergreen/.evg.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,12 @@ functions:
207207
file: mo-expansion.yml
208208

209209
"bootstrap mongohoused":
210+
- command: ec2.assume_role
211+
params:
212+
role_arn: ${aws_test_secrets_role}
210213
- command: shell.exec
211214
params:
215+
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
212216
script: |
213217
DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
214218
- command: shell.exec
@@ -838,6 +842,8 @@ functions:
838842
export K8S_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tar
839843
git archive -o $K8S_DRIVERS_TAR_FILE HEAD
840844
tar -rf $K8S_DRIVERS_TAR_FILE .git
845+
# Loop through all submodule directories and append to the archive
846+
git submodule status --recursive | awk '{ print $2 }' | xargs tar -rf "$K8S_DRIVERS_TAR_FILE"
841847
export K8S_TEST_CMD="OIDC_ENV=k8s VARIANT=${VARIANT} ./.evergreen/run-mongodb-oidc-test.sh"
842848
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
843849
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh
@@ -969,6 +975,8 @@ tasks:
969975
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/run-driver-test.sh
970976
971977
- name: "oidc-auth-test-k8s"
978+
# Might exceed 1 hour of execution.
979+
exec_timeout_secs: 7200
972980
commands:
973981
- command: ec2.assume_role
974982
params:
@@ -983,6 +991,8 @@ tasks:
983991
- func: "oidc-auth-test-k8s-func"
984992
vars:
985993
VARIANT: gke
994+
params:
995+
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
986996

987997
- name: serverless-test
988998
commands:

0 commit comments

Comments
 (0)