File tree 2 files changed +36
-12
lines changed
2 files changed +36
-12
lines changed Original file line number Diff line number Diff line change @@ -62,10 +62,18 @@ jobs:
62
62
- Nutanix
63
63
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
64
64
# - AWS
65
+ cni :
66
+ - Calico
67
+ - Cilium
68
+ addon-strategy :
69
+ - ClusterResourceSet
70
+ - HelmAddon
65
71
fail-fast : false
66
72
uses : ./.github/workflows/e2e.yml
67
73
with :
68
74
provider : ${{ matrix.provider }}
75
+ cni : ${{ matrix.cni }}
76
+ addon-strategy : ${{ matrix.addon-strategy }}
69
77
focus : Quick start
70
78
runs-on : ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
71
79
secrets : inherit
@@ -81,10 +89,18 @@ jobs:
81
89
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
82
90
# - AWS
83
91
# - Nutanix
92
+ cni :
93
+ - Calico
94
+ - Cilium
95
+ addon-strategy :
96
+ - ClusterResourceSet
97
+ - HelmAddon
84
98
fail-fast : false
85
99
uses : ./.github/workflows/e2e.yml
86
100
with :
87
101
provider : ${{ matrix.provider }}
102
+ cni : ${{ matrix.cni }}
103
+ addon-strategy : ${{ matrix.addon-strategy }}
88
104
focus : Self-hosted
89
105
runs-on : ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
90
106
secrets : inherit
Original file line number Diff line number Diff line change 8
8
description : Infrastructure provider to run e2e tests with
9
9
type : string
10
10
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
11
19
skip :
12
20
description : e2e tests to skip
13
21
type : string
42
50
enable-cache : " true"
43
51
skip-nix-installation : ${{ inputs.provider == 'Nutanix' }}
44
52
53
+ - name : Go cache
54
+ uses : actions/cache@v4
55
+ with :
56
+ path : |
57
+ ~/.cache/go-build
58
+ ~/go/pkg/mod
59
+ key : ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
60
+ restore-keys : |
61
+ ${{ runner.os }}-go-
62
+
45
63
# The default disk size of these runners is ~14GB, this is not enough to run the e2e tests.
46
64
# Cleanup the disk, see upstream discussion https://github.com/actions/runner-images/issues/2840.
47
65
- name : Cleanup Disk Space
56
74
echo "After removing files:"
57
75
df -h
58
76
59
- - name : Get Control Plane endpoint IP
77
+ - name : Get Control Plane endpoint IP
60
78
id : get-control-plane-endpoint-ip
61
79
if : inputs.provider == 'Nutanix'
62
80
run : |
73
91
exit 1
74
92
fi
75
93
76
- - name : Go cache
77
- uses : actions/cache@v4
78
- with :
79
- path : |
80
- ~/.cache/go-build
81
- ~/go/pkg/mod
82
- key : ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
83
- restore-keys : |
84
- ${{ runner.os }}-go-
85
-
86
94
- name : Run e2e tests
87
- run : devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}'
95
+ 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 }}'
88
96
env :
89
97
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
90
98
DOCKER_HUB_USERNAME : ${{ secrets.DOCKER_HUB_USERNAME }}
You can’t perform that action at this time.
0 commit comments