Skip to content

Commit 184e8cc

Browse files
committed
test: split out groups
1 parent 660486e commit 184e8cc

File tree

3 files changed

+90
-4
lines changed

3 files changed

+90
-4
lines changed

.evergreen/config.in.yml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ task_groups:
15301530
tasks:
15311531
- test-azurekms-task
15321532

1533-
- name: testk8soidc_task_group
1533+
- name: testk8soidc_task_group_eks
15341534
setup_group:
15351535
- func: fetch source
15361536
- command: ec2.assume_role
@@ -1551,7 +1551,49 @@ task_groups:
15511551
setup_group_timeout_secs: 1800
15521552
tasks:
15531553
- oidc-auth-test-k8s-latest-eks
1554+
1555+
- name: testk8soidc_task_group_gke
1556+
setup_group:
1557+
- func: fetch source
1558+
- command: ec2.assume_role
1559+
params:
1560+
role_arn: ${OIDC_AWS_ROLE_ARN}
1561+
- command: subprocess.exec
1562+
params:
1563+
binary: bash
1564+
args:
1565+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1566+
teardown_task:
1567+
- command: subprocess.exec
1568+
params:
1569+
binary: bash
1570+
args:
1571+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1572+
setup_group_can_fail_task: true
1573+
setup_group_timeout_secs: 1800
1574+
tasks:
15541575
- oidc-auth-test-k8s-latest-gke
1576+
1577+
- name: testk8soidc_task_group_aks
1578+
setup_group:
1579+
- func: fetch source
1580+
- command: ec2.assume_role
1581+
params:
1582+
role_arn: ${OIDC_AWS_ROLE_ARN}
1583+
- command: subprocess.exec
1584+
params:
1585+
binary: bash
1586+
args:
1587+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1588+
teardown_task:
1589+
- command: subprocess.exec
1590+
params:
1591+
binary: bash
1592+
args:
1593+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1594+
setup_group_can_fail_task: true
1595+
setup_group_timeout_secs: 1800
1596+
tasks:
15551597
- oidc-auth-test-k8s-latest-aks
15561598

15571599
- name: testtestoidc_task_group

.evergreen/config.yml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4471,7 +4471,7 @@ task_groups:
44714471
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
44724472
tasks:
44734473
- test-azurekms-task
4474-
- name: testk8soidc_task_group
4474+
- name: testk8soidc_task_group_eks
44754475
setup_group:
44764476
- func: fetch source
44774477
- command: ec2.assume_role
@@ -4492,7 +4492,47 @@ task_groups:
44924492
setup_group_timeout_secs: 1800
44934493
tasks:
44944494
- oidc-auth-test-k8s-latest-eks
4495+
- name: testk8soidc_task_group_gke
4496+
setup_group:
4497+
- func: fetch source
4498+
- command: ec2.assume_role
4499+
params:
4500+
role_arn: ${OIDC_AWS_ROLE_ARN}
4501+
- command: subprocess.exec
4502+
params:
4503+
binary: bash
4504+
args:
4505+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
4506+
teardown_task:
4507+
- command: subprocess.exec
4508+
params:
4509+
binary: bash
4510+
args:
4511+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
4512+
setup_group_can_fail_task: true
4513+
setup_group_timeout_secs: 1800
4514+
tasks:
44954515
- oidc-auth-test-k8s-latest-gke
4516+
- name: testk8soidc_task_group_aks
4517+
setup_group:
4518+
- func: fetch source
4519+
- command: ec2.assume_role
4520+
params:
4521+
role_arn: ${OIDC_AWS_ROLE_ARN}
4522+
- command: subprocess.exec
4523+
params:
4524+
binary: bash
4525+
args:
4526+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
4527+
teardown_task:
4528+
- command: subprocess.exec
4529+
params:
4530+
binary: bash
4531+
args:
4532+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
4533+
setup_group_can_fail_task: true
4534+
setup_group_timeout_secs: 1800
4535+
tasks:
44964536
- oidc-auth-test-k8s-latest-aks
44974537
- name: testtestoidc_task_group
44984538
setup_group:
@@ -5177,7 +5217,9 @@ buildvariants:
51775217
- testtestoidc_task_group
51785218
- testazureoidc_task_group
51795219
- testgcpoidc_task_group
5180-
- testk8soidc_task_group
5220+
- testk8soidc_task_group_eks
5221+
- testk8soidc_task_group_gke
5222+
- testk8soidc_task_group_aks
51815223
- name: rhel8-test-atlas
51825224
display_name: Atlas Cluster Tests
51835225
run_on: rhel80-large

.evergreen/generate_evergreen_tasks.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,9 @@ BUILD_VARIANTS.push({
722722
'testtestoidc_task_group',
723723
'testazureoidc_task_group',
724724
'testgcpoidc_task_group',
725-
'testk8soidc_task_group'
725+
'testk8soidc_task_group_eks',
726+
'testk8soidc_task_group_gke',
727+
'testk8soidc_task_group_aks'
726728
]
727729
});
728730

0 commit comments

Comments
 (0)