Skip to content

Commit 11d9c21

Browse files
ci(k8s): add workspace managed and operator mode e2e to CI
Wire the existing e2e:kubernetes:workspace-managed and e2e:kubernetes:workspace-operator mise tasks into the branch-e2e workflow so they run alongside the other core Kubernetes e2e suites. Both are gated by run_core_e2e and included in the Core E2E result gate. Signed-off-by: Derek Carr <[email protected]>
1 parent c655db1 commit 11d9c21

1 file changed

Lines changed: 34 additions & 2 deletions

File tree

‎.github/workflows/branch-e2e.yml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,34 @@ jobs:
182182
extra-helm-values: ${{ matrix.extra_helm_values }}
183183
cli-artifact-prefix: rust-binary-cli
184184

185+
kubernetes-workspace-managed-e2e:
186+
needs: [pr_metadata, build-gateway, build-supervisor, build-cli]
187+
if: needs.pr_metadata.outputs.should_run == 'true' && needs.pr_metadata.outputs.run_core_e2e == 'true'
188+
permissions:
189+
actions: read
190+
contents: read
191+
packages: read
192+
uses: ./.github/workflows/e2e-kubernetes-test.yml
193+
with:
194+
image-tag: ${{ github.sha }}
195+
job-name: Kubernetes E2E (workspace managed mode)
196+
e2e-task: e2e:kubernetes:workspace-managed
197+
cli-artifact-prefix: rust-binary-cli
198+
199+
kubernetes-workspace-operator-e2e:
200+
needs: [pr_metadata, build-gateway, build-supervisor, build-cli]
201+
if: needs.pr_metadata.outputs.should_run == 'true' && needs.pr_metadata.outputs.run_core_e2e == 'true'
202+
permissions:
203+
actions: read
204+
contents: read
205+
packages: read
206+
uses: ./.github/workflows/e2e-kubernetes-test.yml
207+
with:
208+
image-tag: ${{ github.sha }}
209+
job-name: Kubernetes E2E (workspace operator mode)
210+
e2e-task: e2e:kubernetes:workspace-operator
211+
cli-artifact-prefix: rust-binary-cli
212+
185213
kubernetes-ha-e2e:
186214
needs: [pr_metadata, build-gateway, build-supervisor, build-cli]
187215
if: needs.pr_metadata.outputs.should_run == 'true' && needs.pr_metadata.outputs.run_kubernetes_ha_e2e == 'true'
@@ -212,7 +240,7 @@ jobs:
212240

213241
core-e2e-result:
214242
name: Core E2E result
215-
needs: [pr_metadata, build-gateway, build-supervisor, build-cli, build-driver-vm-linux, e2e, kubernetes-e2e]
243+
needs: [pr_metadata, build-gateway, build-supervisor, build-cli, build-driver-vm-linux, e2e, kubernetes-e2e, kubernetes-workspace-managed-e2e, kubernetes-workspace-operator-e2e]
216244
if: always() && needs.pr_metadata.outputs.should_run == 'true' && needs.pr_metadata.outputs.run_core_e2e == 'true'
217245
runs-on: ubuntu-latest
218246
steps:
@@ -224,6 +252,8 @@ jobs:
224252
BUILD_DRIVER_VM_RESULT: ${{ needs.build-driver-vm-linux.result }}
225253
E2E_RESULT: ${{ needs.e2e.result }}
226254
KUBERNETES_E2E_RESULT: ${{ needs.kubernetes-e2e.result }}
255+
KUBERNETES_WORKSPACE_MANAGED_E2E_RESULT: ${{ needs.kubernetes-workspace-managed-e2e.result }}
256+
KUBERNETES_WORKSPACE_OPERATOR_E2E_RESULT: ${{ needs.kubernetes-workspace-operator-e2e.result }}
227257
run: |
228258
set -euo pipefail
229259
failed=0
@@ -233,7 +263,9 @@ jobs:
233263
"build-cli:$BUILD_CLI_RESULT" \
234264
"build-driver-vm-linux:$BUILD_DRIVER_VM_RESULT" \
235265
"e2e:$E2E_RESULT" \
236-
"kubernetes-e2e:$KUBERNETES_E2E_RESULT"; do
266+
"kubernetes-e2e:$KUBERNETES_E2E_RESULT" \
267+
"kubernetes-workspace-managed-e2e:$KUBERNETES_WORKSPACE_MANAGED_E2E_RESULT" \
268+
"kubernetes-workspace-operator-e2e:$KUBERNETES_WORKSPACE_OPERATOR_E2E_RESULT"; do
237269
name="${item%%:*}"
238270
result="${item#*:}"
239271
if [ "$result" != "success" ]; then

0 commit comments

Comments
 (0)