Skip to content

Commit 5f4a859

Browse files
committed
test: send drivers tools to script
1 parent 83aa49b commit 5f4a859

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

.evergreen/config.in.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ tasks:
12661266
args:
12671267
- src/.evergreen/run-azure-kms-tests.sh
12681268

1269-
- name: "oidc-auth-test-k8s-latest"
1269+
- name: "oidc-auth-test-k8s-latest-eks"
12701270
commands:
12711271
- func: "install dependencies"
12721272
- command: subprocess.exec
@@ -1280,9 +1280,13 @@ tasks:
12801280
ENVIRONMENT: k8s
12811281
K8S_VARIANT: eks
12821282
SCRIPT: run-oidc-prose-tests.sh
1283-
include_expansions_in_env: ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1283+
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
12841284
args:
12851285
- .evergreen/run-oidc-tests-k8s.sh
1286+
1287+
- name: "oidc-auth-test-k8s-latest-eks"
1288+
commands:
1289+
- func: "install dependencies"
12861290
- command: subprocess.exec
12871291
type: test
12881292
params:
@@ -1294,9 +1298,13 @@ tasks:
12941298
ENVIRONMENT: k8s
12951299
K8S_VARIANT: gke
12961300
SCRIPT: run-oidc-prose-tests.sh
1297-
include_expansions_in_env: ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1301+
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
12981302
args:
12991303
- .evergreen/run-oidc-tests-k8s.sh
1304+
1305+
- name: "oidc-auth-test-k8s-latest-aks"
1306+
commands:
1307+
- func: "install dependencies"
13001308
- command: subprocess.exec
13011309
type: test
13021310
params:
@@ -1308,7 +1316,7 @@ tasks:
13081316
ENVIRONMENT: k8s
13091317
K8S_VARIANT: aks
13101318
SCRIPT: run-oidc-prose-tests.sh
1311-
include_expansions_in_env: ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
1319+
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
13121320
args:
13131321
- .evergreen/run-oidc-tests-k8s.sh
13141322

@@ -1542,7 +1550,9 @@ task_groups:
15421550
setup_group_can_fail_task: true
15431551
setup_group_timeout_secs: 1800
15441552
tasks:
1545-
- oidc-auth-test-k8s-latest
1553+
- oidc-auth-test-k8s-latest-eks
1554+
- oidc-auth-test-k8s-latest-gke
1555+
- oidc-auth-test-k8s-latest-aks
15461556

15471557
- name: testtestoidc_task_group
15481558
setup_group:

.evergreen/config.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ tasks:
12181218
EXPECTED_AZUREKMS_OUTCOME: failure
12191219
args:
12201220
- src/.evergreen/run-azure-kms-tests.sh
1221-
- name: oidc-auth-test-k8s-latest
1221+
- name: oidc-auth-test-k8s-latest-eks
12221222
commands:
12231223
- func: install dependencies
12241224
- command: subprocess.exec
@@ -1233,12 +1233,14 @@ tasks:
12331233
K8S_VARIANT: eks
12341234
SCRIPT: run-oidc-prose-tests.sh
12351235
include_expansions_in_env:
1236-
- DRIVERS_TOOLS
12371236
- AWS_ACCESS_KEY_ID
12381237
- AWS_SECRET_ACCESS_KEY
12391238
- AWS_SESSION_TOKEN
12401239
args:
12411240
- .evergreen/run-oidc-tests-k8s.sh
1241+
- name: oidc-auth-test-k8s-latest-eks
1242+
commands:
1243+
- func: install dependencies
12421244
- command: subprocess.exec
12431245
type: test
12441246
params:
@@ -1251,12 +1253,14 @@ tasks:
12511253
K8S_VARIANT: gke
12521254
SCRIPT: run-oidc-prose-tests.sh
12531255
include_expansions_in_env:
1254-
- DRIVERS_TOOLS
12551256
- AWS_ACCESS_KEY_ID
12561257
- AWS_SECRET_ACCESS_KEY
12571258
- AWS_SESSION_TOKEN
12581259
args:
12591260
- .evergreen/run-oidc-tests-k8s.sh
1261+
- name: oidc-auth-test-k8s-latest-aks
1262+
commands:
1263+
- func: install dependencies
12601264
- command: subprocess.exec
12611265
type: test
12621266
params:
@@ -1269,7 +1273,6 @@ tasks:
12691273
K8S_VARIANT: aks
12701274
SCRIPT: run-oidc-prose-tests.sh
12711275
include_expansions_in_env:
1272-
- DRIVERS_TOOLS
12731276
- AWS_ACCESS_KEY_ID
12741277
- AWS_SECRET_ACCESS_KEY
12751278
- AWS_SESSION_TOKEN
@@ -4488,7 +4491,9 @@ task_groups:
44884491
setup_group_can_fail_task: true
44894492
setup_group_timeout_secs: 1800
44904493
tasks:
4491-
- oidc-auth-test-k8s-latest
4494+
- oidc-auth-test-k8s-latest-eks
4495+
- oidc-auth-test-k8s-latest-gke
4496+
- oidc-auth-test-k8s-latest-aks
44924497
- name: testtestoidc_task_group
44934498
setup_group:
44944499
- func: fetch source

.evergreen/run-oidc-tests-k8s.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export K8S_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
66
tar czf $K8S_DRIVERS_TAR_FILE .
77
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
88
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh
9-
export K8S_TEST_CMD="ENVIRONMENT=k8s ./.evergreen/${SCRIPT}"
9+
export K8S_TEST_CMD="DRIVERS_TOOLS=${DRIVERS_TOOLS} ENVIRONMENT=k8s ./.evergreen/${SCRIPT}"
1010
source $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/secrets-export.sh
1111
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-driver-test.sh
1212
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/teardown-pod.sh

0 commit comments

Comments
 (0)