Skip to content

Commit 68b7495

Browse files
committed
test: split out groups
1 parent b916a8f commit 68b7495

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
@@ -1541,7 +1541,7 @@ task_groups:
15411541
tasks:
15421542
- test-azurekms-task
15431543

1544-
- name: testk8soidc_task_group
1544+
- name: testk8soidc_task_group_eks
15451545
setup_group:
15461546
- func: fetch source
15471547
- command: ec2.assume_role
@@ -1562,7 +1562,49 @@ task_groups:
15621562
setup_group_timeout_secs: 1800
15631563
tasks:
15641564
- oidc-auth-test-k8s-latest-eks
1565+
1566+
- name: testk8soidc_task_group_gke
1567+
setup_group:
1568+
- func: fetch source
1569+
- command: ec2.assume_role
1570+
params:
1571+
role_arn: ${OIDC_AWS_ROLE_ARN}
1572+
- command: subprocess.exec
1573+
params:
1574+
binary: bash
1575+
args:
1576+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1577+
teardown_task:
1578+
- command: subprocess.exec
1579+
params:
1580+
binary: bash
1581+
args:
1582+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1583+
setup_group_can_fail_task: true
1584+
setup_group_timeout_secs: 1800
1585+
tasks:
15651586
- oidc-auth-test-k8s-latest-gke
1587+
1588+
- name: testk8soidc_task_group_aks
1589+
setup_group:
1590+
- func: fetch source
1591+
- command: ec2.assume_role
1592+
params:
1593+
role_arn: ${OIDC_AWS_ROLE_ARN}
1594+
- command: subprocess.exec
1595+
params:
1596+
binary: bash
1597+
args:
1598+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1599+
teardown_task:
1600+
- command: subprocess.exec
1601+
params:
1602+
binary: bash
1603+
args:
1604+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1605+
setup_group_can_fail_task: true
1606+
setup_group_timeout_secs: 1800
1607+
tasks:
15661608
- oidc-auth-test-k8s-latest-aks
15671609

15681610
- name: testtestoidc_task_group

.evergreen/config.yml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4482,7 +4482,7 @@ task_groups:
44824482
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
44834483
tasks:
44844484
- test-azurekms-task
4485-
- name: testk8soidc_task_group
4485+
- name: testk8soidc_task_group_eks
44864486
setup_group:
44874487
- func: fetch source
44884488
- command: ec2.assume_role
@@ -4503,7 +4503,47 @@ task_groups:
45034503
setup_group_timeout_secs: 1800
45044504
tasks:
45054505
- oidc-auth-test-k8s-latest-eks
4506+
- name: testk8soidc_task_group_gke
4507+
setup_group:
4508+
- func: fetch source
4509+
- command: ec2.assume_role
4510+
params:
4511+
role_arn: ${OIDC_AWS_ROLE_ARN}
4512+
- command: subprocess.exec
4513+
params:
4514+
binary: bash
4515+
args:
4516+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
4517+
teardown_task:
4518+
- command: subprocess.exec
4519+
params:
4520+
binary: bash
4521+
args:
4522+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
4523+
setup_group_can_fail_task: true
4524+
setup_group_timeout_secs: 1800
4525+
tasks:
45064526
- oidc-auth-test-k8s-latest-gke
4527+
- name: testk8soidc_task_group_aks
4528+
setup_group:
4529+
- func: fetch source
4530+
- command: ec2.assume_role
4531+
params:
4532+
role_arn: ${OIDC_AWS_ROLE_ARN}
4533+
- command: subprocess.exec
4534+
params:
4535+
binary: bash
4536+
args:
4537+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
4538+
teardown_task:
4539+
- command: subprocess.exec
4540+
params:
4541+
binary: bash
4542+
args:
4543+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
4544+
setup_group_can_fail_task: true
4545+
setup_group_timeout_secs: 1800
4546+
tasks:
45074547
- oidc-auth-test-k8s-latest-aks
45084548
- name: testtestoidc_task_group
45094549
setup_group:
@@ -5197,7 +5237,9 @@ buildvariants:
51975237
- testtestoidc_task_group
51985238
- testazureoidc_task_group
51995239
- testgcpoidc_task_group
5200-
- testk8soidc_task_group
5240+
- testk8soidc_task_group_eks
5241+
- testk8soidc_task_group_gke
5242+
- testk8soidc_task_group_aks
52015243
- name: rhel8-test-atlas
52025244
display_name: Atlas Cluster Tests
52035245
run_on: rhel80-large

.evergreen/generate_evergreen_tasks.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,9 @@ BUILD_VARIANTS.push({
734734
'testtestoidc_task_group',
735735
'testazureoidc_task_group',
736736
'testgcpoidc_task_group',
737-
'testk8soidc_task_group'
737+
'testk8soidc_task_group_eks',
738+
'testk8soidc_task_group_gke',
739+
'testk8soidc_task_group_aks'
738740
]
739741
});
740742

0 commit comments

Comments
 (0)