Skip to content

Commit 630f24b

Browse files
committed
Split out k8s tests
1 parent 77158c5 commit 630f24b

File tree

1 file changed

+74
-4
lines changed

1 file changed

+74
-4
lines changed

.evergreen/.evg.yml

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -982,17 +982,29 @@ tasks:
982982
tar --exclude-vcs -czf $GCPOIDC_DRIVERS_TAR_FILE .
983983
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/run-driver-test.sh
984984
985-
- name: "oidc-auth-test-k8s-task"
985+
- name: "oidc-auth-test-k8s-eks-task"
986986
# Might exceed 1 hour of execution.
987987
exec_timeout_secs: 7200
988988
commands:
989989
- func: "assume-aws-test-secrets-role"
990990
- func: "run-oidc-auth-test-k8s-test"
991991
vars:
992992
VARIANT: eks
993+
994+
- name: "oidc-auth-test-k8s-aks-task"
995+
# Might exceed 1 hour of execution.
996+
exec_timeout_secs: 7200
997+
commands:
998+
- func: "assume-aws-test-secrets-role"
993999
- func: "run-oidc-auth-test-k8s-test"
9941000
vars:
9951001
VARIANT: aks
1002+
1003+
- name: "oidc-auth-test-k8s-gke-task"
1004+
# Might exceed 1 hour of execution.
1005+
exec_timeout_secs: 7200
1006+
commands:
1007+
- func: "assume-aws-test-secrets-role"
9961008
- func: "run-oidc-auth-test-k8s-test"
9971009
vars:
9981010
VARIANT: gke
@@ -2152,7 +2164,34 @@ task_groups:
21522164
tasks:
21532165
- "oidc-auth-test-gcp-task"
21542166

2155-
- name: "test-oidc-k8s-task-group"
2167+
- name: "test-oidc-k8s-eks-task-group"
2168+
setup_group_can_fail_task: true
2169+
setup_group_timeout_secs: 1800
2170+
teardown_task_can_fail_task: true
2171+
teardown_task_timeout_secs: 1800
2172+
setup_group:
2173+
- func: "fetch-source"
2174+
- func: "prepare-resources"
2175+
- func: "fix-absolute-paths"
2176+
- func: "gradle-cache"
2177+
- func: "create-archive-tar-file"
2178+
- func: "assume-aws-test-secrets-role"
2179+
- command: subprocess.exec
2180+
params:
2181+
binary: bash
2182+
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
2183+
args:
2184+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
2185+
teardown_task:
2186+
- command: subprocess.exec
2187+
params:
2188+
binary: bash
2189+
args:
2190+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
2191+
tasks:
2192+
- "oidc-auth-test-k8s-eks-task"
2193+
2194+
- name: "test-oidc-k8s-aks-task-group"
21562195
setup_group_can_fail_task: true
21572196
setup_group_timeout_secs: 1800
21582197
teardown_task_can_fail_task: true
@@ -2177,7 +2216,34 @@ task_groups:
21772216
args:
21782217
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
21792218
tasks:
2180-
- "oidc-auth-test-k8s-task"
2219+
- "oidc-auth-test-k8s-aks-task"
2220+
2221+
- name: "test-oidc-k8s-gke-task-group"
2222+
setup_group_can_fail_task: true
2223+
setup_group_timeout_secs: 1800
2224+
teardown_task_can_fail_task: true
2225+
teardown_task_timeout_secs: 1800
2226+
setup_group:
2227+
- func: "fetch-source"
2228+
- func: "prepare-resources"
2229+
- func: "fix-absolute-paths"
2230+
- func: "gradle-cache"
2231+
- func: "create-archive-tar-file"
2232+
- func: "assume-aws-test-secrets-role"
2233+
- command: subprocess.exec
2234+
params:
2235+
binary: bash
2236+
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
2237+
args:
2238+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
2239+
teardown_task:
2240+
- command: subprocess.exec
2241+
params:
2242+
binary: bash
2243+
args:
2244+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
2245+
tasks:
2246+
- "oidc-auth-test-k8s-gke-task"
21812247

21822248
buildvariants:
21832249

@@ -2231,7 +2297,11 @@ buildvariants:
22312297
display_name: "OIDC Auth K8S"
22322298
run_on: ubuntu2204-small
22332299
tasks:
2234-
- name: "test-oidc-k8s-task-group"
2300+
- name: "test-oidc-k8s-eks-task-group"
2301+
batchtime: 20160 # 14 days
2302+
- name: "test-oidc-k8s-aks-task-group"
2303+
batchtime: 20160 # 14 days
2304+
- name: "test-oidc-k8s-gke-task-group"
22352305
batchtime: 20160 # 14 days
22362306

22372307
- name: "atlas-search-variant"

0 commit comments

Comments
 (0)