From eba6d57acd9aa9ecec7c9b23510222d6e4a0acce Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Fri, 2 May 2025 09:55:44 -0700 Subject: [PATCH 1/4] Include submodules to OIDC testing. --- .evergreen/.evg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index b1685115e7..a56aea5e76 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -836,7 +836,7 @@ functions: git commit --allow-empty -m "add files" # uncompressed tar used to allow appending .git folder export K8S_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tar - git archive -o $K8S_DRIVERS_TAR_FILE HEAD + git archive --recursive -o $K8S_DRIVERS_TAR_FILE HEAD tar -rf $K8S_DRIVERS_TAR_FILE .git 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 From a7caca54794155789544fc368e1c38dfa1db60cc Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Fri, 2 May 2025 10:41:14 -0700 Subject: [PATCH 2/4] Use submodule foreach. --- .evergreen/.evg.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index a56aea5e76..fe3251cab5 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -838,6 +838,11 @@ functions: export K8S_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tar git archive --recursive -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 foreach --recursive ' + echo "Appending submodule $path to archive" + tar -rf $K8S_DRIVERS_TAR_FILE $path + ' 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 From 3f4eb69e8d515506758a55417203dc5b4ac93f77 Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Fri, 2 May 2025 10:56:10 -0700 Subject: [PATCH 3/4] Remove recursive. --- .evergreen/.evg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index fe3251cab5..73081df139 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -836,7 +836,7 @@ functions: git commit --allow-empty -m "add files" # uncompressed tar used to allow appending .git folder export K8S_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tar - git archive --recursive -o $K8S_DRIVERS_TAR_FILE HEAD + 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 foreach --recursive ' From 88795443fe3747ab673debda634f544616fdfab8 Mon Sep 17 00:00:00 2001 From: "slav.babanin" Date: Fri, 2 May 2025 12:01:26 -0700 Subject: [PATCH 4/4] Add submodules. --- .evergreen/.evg.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml index 73081df139..760704d970 100644 --- a/.evergreen/.evg.yml +++ b/.evergreen/.evg.yml @@ -839,10 +839,7 @@ functions: 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 foreach --recursive ' - echo "Appending submodule $path to archive" - tar -rf $K8S_DRIVERS_TAR_FILE $path - ' + 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