From cb443465a6c3efd063593d4e56d5b4ebb06150fa Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin <slav.babanin@mongodb.com>
Date: Wed, 28 May 2025 01:31:16 -0700
Subject: [PATCH 1/2] Fix datalake and k8s test failures (#1720)

- Increase timeout for k8s tests.
- Add explicit "assume role".

(cherry picked from commit dcc037113d8f0111a626586b988a8876b7ebba80)
---
 .evergreen/.evg.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
index b1685115e7..96ecf14eb4 100644
--- a/.evergreen/.evg.yml
+++ b/.evergreen/.evg.yml
@@ -207,8 +207,12 @@ functions:
         file: mo-expansion.yml
 
   "bootstrap mongohoused":
+    - command: ec2.assume_role
+      params:
+        role_arn: ${aws_test_secrets_role}
     - command: shell.exec
       params:
+        include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
         script: |
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
     - command: shell.exec
@@ -969,6 +973,8 @@ tasks:
               bash $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/run-driver-test.sh
 
     - name: "oidc-auth-test-k8s"
+      # Might exceed 1 hour of execution.
+      exec_timeout_secs: 7200
       commands:
         - command: ec2.assume_role
           params:
@@ -983,6 +989,8 @@ tasks:
         - func: "oidc-auth-test-k8s-func"
           vars:
             VARIANT: gke
+          params:
+            include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
 
     - name: serverless-test
       commands:

From a6f22bf6dca33c99125ea9db155b85972f9561af Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin <slav.babanin@mongodb.com>
Date: Tue, 27 May 2025 08:12:23 -0700
Subject: [PATCH 2/2] Include submodules to OIDC testing. (#1703)

(cherry picked from commit 7e94bc28f7264beb0a4fb62ae32d08122869838c)
---
 .evergreen/.evg.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
index 96ecf14eb4..b28e40a075 100644
--- a/.evergreen/.evg.yml
+++ b/.evergreen/.evg.yml
@@ -842,6 +842,8 @@ functions:
             export K8S_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tar
             git archive -o $K8S_DRIVERS_TAR_FILE HEAD
             tar -rf $K8S_DRIVERS_TAR_FILE .git
+            # Loop through all submodule directories and append to the archive
+            git submodule status --recursive | awk '{ print $2 }' | xargs tar -rf "$K8S_DRIVERS_TAR_FILE"
             export K8S_TEST_CMD="OIDC_ENV=k8s VARIANT=${VARIANT} ./.evergreen/run-mongodb-oidc-test.sh"
             bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
             bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh