@@ -830,13 +830,15 @@ functions:
830
830
type : test
831
831
params :
832
832
shell : bash
833
+ working-directory : " src"
833
834
include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
834
835
script : |-
835
836
set -o errexit
836
837
${PREPARE_SHELL}
837
838
export K8S_VARIANT=${VARIANT}
838
- export K8S_DRIVERS_TAR_FILE=$(./.evergreen/git-archive.sh)
839
- export K8S_TEST_CMD="OIDC_ENV=k8s VARIANT=${VARIANT} ./.evergreen/run-mongodb-oidc-test.sh"
839
+ export K8S_DRIVERS_TAR_FILE="/tmp/mongo-java-driver.tgz"
840
+ export K8S_TEST_CMD="OIDC_ENV=k8s K8S_DRIVERS_TAR_FILE
841
+ tar czf $K8S_DRIVERS_TAR_FILE .
840
842
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
841
843
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh
842
844
source $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/secrets-export.sh
@@ -929,29 +931,33 @@ tasks:
929
931
commands :
930
932
- command : shell.exec
931
933
params :
932
- shell : bash
934
+ shell : " bash"
935
+ working_dir : " src"
933
936
env :
934
937
JAVA_HOME : ${JAVA_HOME}
935
938
script : |-
936
939
set -o errexit
937
940
${PREPARE_SHELL}
938
- export AZUREOIDC_DRIVERS_TAR_FILE=$(./.evergreen/git-archive.sh)
941
+ export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tgz
939
942
export AZUREOIDC_TEST_CMD="OIDC_ENV=azure ./.evergreen/run-mongodb-oidc-test.sh"
943
+ tar czf $AZUREOIDC_DRIVERS_TAR_FILE .
940
944
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
941
945
942
946
- name : " oidc-auth-test-gcp"
943
947
commands :
944
948
- command : shell.exec
945
949
params :
946
- shell : bash
950
+ shell : " bash"
951
+ working_dir : " src"
947
952
script : |-
948
953
set -o errexit
949
954
${PREPARE_SHELL}
950
- export GCPOIDC_DRIVERS_TAR_FILE=$(./.evergreen/git-archive.sh)
955
+ export GCPOIDC_DRIVERS_TAR_FILE=/tmp/mongo-java-driver.tgz
951
956
# Define the command to run on the VM.
952
957
# Ensure that we source the environment file created for us, set up any other variables we need,
953
958
# and then run our test suite on the vm.
954
959
export GCPOIDC_TEST_CMD="OIDC_ENV=gcp ./.evergreen/run-mongodb-oidc-test.sh"
960
+ tar czf $GCPOIDC_DRIVERS_TAR_FILE .
955
961
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/run-driver-test.sh
956
962
957
963
- name : " oidc-auth-test-k8s"
@@ -971,8 +977,6 @@ tasks:
971
977
- func : " oidc-auth-test-k8s-func"
972
978
vars :
973
979
VARIANT : gke
974
- params :
975
- include_expansions_in_env : [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
976
980
977
981
- name : serverless-test
978
982
commands :
@@ -1706,11 +1710,11 @@ tasks:
1706
1710
export AZUREKMS_RESOURCEGROUP=${testazurekms_resourcegroup}
1707
1711
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
1708
1712
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
1709
- tar czf /tmp/mongo-csharp -driver.tgz .
1710
- AZUREKMS_SRC=/tmp/mongo-csharp -driver.tgz AZUREKMS_DST="~/" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
1713
+ tar czf /tmp/mongo-java -driver.tgz .
1714
+ AZUREKMS_SRC=/tmp/mongo-java -driver.tgz AZUREKMS_DST="~/" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
1711
1715
echo "Copying files ... end"
1712
1716
echo "Untarring file ... begin"
1713
- AZUREKMS_CMD="tar xf mongo-csharp -driver.tgz" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
1717
+ AZUREKMS_CMD="tar xf mongo-java -driver.tgz" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
1714
1718
echo "Untarring file ... end"
1715
1719
- command : shell.exec
1716
1720
type : test
@@ -2071,6 +2075,10 @@ task_groups:
2071
2075
- oidc-auth-test
2072
2076
2073
2077
- name : test-oidc-azure-task-group
2078
+ setup_group_can_fail_task : true
2079
+ setup_group_timeout_secs : 1800
2080
+ teardown_task_can_fail_task : true
2081
+ teardown_group_timeout_secs : 1800
2074
2082
setup_group :
2075
2083
- func : fetch source
2076
2084
- func : prepare resources
@@ -2088,12 +2096,14 @@ task_groups:
2088
2096
binary : bash
2089
2097
args :
2090
2098
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/delete-vm.sh
2091
- setup_group_can_fail_task : true
2092
- setup_group_timeout_secs : 1800
2093
2099
tasks :
2094
2100
- oidc-auth-test-azure
2095
2101
2096
2102
- name : test-oidc-gcp-task-group
2103
+ setup_group_can_fail_task : true
2104
+ setup_group_timeout_secs : 1800
2105
+ teardown_task_can_fail_task : true
2106
+ teardown_group_timeout_secs : 1800
2097
2107
setup_group :
2098
2108
- func : fetch source
2099
2109
- func : prepare resources
@@ -2112,16 +2122,14 @@ task_groups:
2112
2122
binary : bash
2113
2123
args :
2114
2124
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/gcp/teardown.sh
2115
- setup_group_can_fail_task : true
2116
- setup_group_timeout_secs : 1800
2117
2125
tasks :
2118
2126
- oidc-auth-test-gcp
2119
2127
2120
2128
- name : test-oidc-k8s-task-group
2121
2129
setup_group_can_fail_task : true
2122
2130
setup_group_timeout_secs : 1800
2123
2131
teardown_task_can_fail_task : true
2124
- teardown_group_timeout_secs : 180
2132
+ teardown_group_timeout_secs : 180 # 3 minutes (max allowed time)
2125
2133
setup_group :
2126
2134
- func : fetch source
2127
2135
- func : prepare resources
0 commit comments