Skip to content

Commit e78f934

Browse files
alacukualacuku
authored
Merge branch 'main' into kcl/konnect-eventgateway
2 parents 4c12fd3 + 0cf46ef commit e78f934

File tree

51 files changed

+692
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+692
-286
lines changed

‎.github/workflows/__conformance_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
go-version-file: go.mod
4040
cache: false
4141

42-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
42+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
4343
with:
4444
install: false
4545

‎.github/workflows/__crdvalidation_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- run: echo "GO_MOD_CACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV
3838
- run: echo "GO_BUILD_CACHE=$(go env GOCACHE)" >> $GITHUB_ENV
3939

40-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
40+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
4141
with:
4242
install: false
4343

‎.github/workflows/__e2e_chainsaw_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: build docker image
3636
run: make docker.build
3737

38-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
38+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
3939
with:
4040
install_args: github:Kong/kubernetes-testing-framework http:helm
4141

‎.github/workflows/__e2e_tests.yaml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: E2E tests
2+
3+
on:
4+
workflow_call: {}
5+
6+
permissions:
7+
contents: read
8+
9+
env:
10+
MISE_VERBOSE: 1
11+
MISE_DEBUG: 1
12+
13+
jobs:
14+
e2e-tests:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Harden Runner
18+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
19+
with:
20+
egress-policy: audit
21+
- name: checkout repository
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
23+
with:
24+
fetch-depth: 0
25+
26+
- name: setup golang
27+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
28+
with:
29+
go-version-file: go.mod
30+
cache: false
31+
32+
- name: build docker image
33+
env:
34+
IMG: kong-operator
35+
TAG: e2e-${{ github.sha }}
36+
run: make docker.build
37+
38+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
39+
with:
40+
install: false
41+
42+
- run: echo "GO_MOD_CACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV
43+
- run: echo "GO_BUILD_CACHE=$(go env GOCACHE)" >> $GITHUB_ENV
44+
45+
- run: echo "GO_CACHE_KEY=go-e2e-${{ runner.os }}-${{ runner.arch }}-go-${{ hashFiles('**/go.mod') }}" >> $GITHUB_ENV
46+
- run: echo "GO_CACHE_KEY_2=go-e2e-${{ runner.os }}-${{ runner.arch }}-go-" >> $GITHUB_ENV
47+
48+
- name: Go cache main branch
49+
if: ${{ github.ref == 'refs/heads/main' }}
50+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
51+
with:
52+
path: |
53+
${{ env.GO_MOD_CACHE }}
54+
${{ env.GO_BUILD_CACHE }}
55+
key: ${{ env.GO_CACHE_KEY }}
56+
restore-keys: |
57+
${{ env.GO_CACHE_KEY }}
58+
${{ env.GO_CACHE_KEY_2 }}
59+
60+
- name: Go cache (restore only for non-main branches)
61+
if: ${{ github.ref != 'refs/heads/main' }}
62+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
63+
with:
64+
path: |
65+
${{ env.GO_MOD_CACHE }}
66+
${{ env.GO_BUILD_CACHE }}
67+
key: ${{ env.GO_CACHE_KEY }}
68+
restore-keys: |
69+
${{ env.GO_CACHE_KEY }}
70+
${{ env.GO_CACHE_KEY_2 }}
71+
72+
- name: run e2e tests
73+
run: make test.e2e
74+
env:
75+
KONG_TEST_KONG_OPERATOR_IMAGE_LOAD: kong-operator:e2e-${{ github.sha }}
76+
GOTESTSUM_JUNITFILE: "e2e-tests.xml"
77+
# This is needed for ktf to find latest releases of addons.
78+
# This could be changed so that ktf addons have their versions pinned
79+
# in the test Makefile instead.
80+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
82+
- name: upload diagnostics
83+
if: always()
84+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
85+
with:
86+
name: diagnostics-e2e
87+
path: /tmp/ktf-diag*
88+
if-no-files-found: ignore
89+
90+
- name: collect test report
91+
if: ${{ always() }}
92+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
93+
with:
94+
name: tests-report-e2e
95+
path: e2e-tests.xml

‎.github/workflows/__envtest_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- run: echo "GO_MOD_CACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV
3535
- run: echo "GO_BUILD_CACHE=$(go env GOCACHE)" >> $GITHUB_ENV
3636

37-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
37+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
3838
with:
3939
install: false
4040

‎.github/workflows/__integration_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
go-version-file: go.mod
4343
cache: false
4444

45-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
45+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
4646
with:
4747
install: false
4848

‎.github/workflows/__kongintegration_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
echo "TEST_KONG_IMAGE=kong/kong-gateway" >> $GITHUB_ENV
5252
echo "TEST_KONG_TAG=$(yq -ojson -r '.kongintegration.kong-ee' < test/test_dependencies.yaml )" >> $GITHUB_ENV
5353
54-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
54+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
5555
with:
5656
install: false
5757

‎.github/workflows/__lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
go-version-file: go.mod
2727
cache: false
2828

29-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
29+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
3030
with:
3131
install: false
3232

‎.github/workflows/__release-workflow.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
go-version-file: go.mod
158158

159-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
159+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
160160
with:
161161
install: false
162162

@@ -217,7 +217,7 @@ jobs:
217217
with:
218218
go-version-file: go.mod
219219

220-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
220+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
221221
with:
222222
install: false
223223

@@ -305,7 +305,7 @@ jobs:
305305
echo "VERSION=${VERSION}" >> $GITHUB_ENV
306306
echo ${VERSION} > VERSION
307307
308-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
308+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
309309
with:
310310
install: false
311311

‎.github/workflows/__unit_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- run: echo "GO_MOD_CACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV
2929
- run: echo "GO_BUILD_CACHE=$(go env GOCACHE)" >> $GITHUB_ENV
3030

31-
- uses: jdx/mise-action@5228313ee0372e111a38da051671ca30fc5a96db # v3.6.3
31+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
3232
with:
3333
install: false
3434

0 commit comments

Comments
 (0)