Skip to content

Commit 11e642c

Browse files
committed
test(e2e): Use parallel tests for providers other than Docker
Keep Docker using serial tests to not exhaust resources of the machine that the Docker tests are running on. Other providers do not require so many resources as they use cloud or external infrastructure for clusters.
1 parent f8d2dce commit 11e642c

File tree

4 files changed

+307
-300
lines changed

4 files changed

+307
-300
lines changed

.github/workflows/checks.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,10 @@ jobs:
6868
- Nutanix
6969
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
7070
# - AWS
71-
cni:
72-
- Calico
73-
- Cilium
74-
addon-strategy:
75-
- ClusterResourceSet
76-
- HelmAddon
7771
fail-fast: false
7872
uses: ./.github/workflows/e2e.yml
7973
with:
8074
provider: ${{ matrix.provider }}
81-
cni: ${{ matrix.cni }}
82-
addon-strategy: ${{ matrix.addon-strategy }}
8375
focus: Quick start
8476
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
8577
secrets: inherit
@@ -101,18 +93,10 @@ jobs:
10193
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
10294
# - AWS
10395
# - Nutanix
104-
cni:
105-
- Calico
106-
- Cilium
107-
addon-strategy:
108-
- ClusterResourceSet
109-
- HelmAddon
11096
fail-fast: false
11197
uses: ./.github/workflows/e2e.yml
11298
with:
11399
provider: ${{ matrix.provider }}
114-
cni: ${{ matrix.cni }}
115-
addon-strategy: ${{ matrix.addon-strategy }}
116100
focus: Self-hosted
117101
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
118102
secrets: inherit

.github/workflows/e2e.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ on:
88
description: Infrastructure provider to run e2e tests with
99
type: string
1010
required: true
11-
cni:
12-
description: CNI to run e2e tests with
13-
type: string
14-
required: true
15-
addon-strategy:
16-
description: Addon strategy to run e2e tests with
17-
type: string
18-
required: true
1911
skip:
2012
description: e2e tests to skip
2113
type: string
@@ -95,7 +87,7 @@ jobs:
9587
fi
9688
9789
- name: Run e2e tests
98-
run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }} && cni:${{ inputs.cni }} && addonStrategy:${{ inputs.addon-strategy }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}' E2E_VERBOSE=true
90+
run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}' E2E_VERBOSE=true
9991
env:
10092
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10193
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}

0 commit comments

Comments
 (0)