Skip to content

Commit 07524c9

Browse files
pmalekpmalek
committed
chore(ci): migrate actions/upload-artifact and actions/download-artifact to v4
1 parent cb66c42 commit 07524c9

11 files changed

+92
-58
lines changed

‎.github/workflows/_conformance_tests.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
env:
5858
MISE_VERBOSE: 1
5959
MISE_DEBUG: 1
60-
JUNIT_REPORT: conformance-tests.xml
60+
JUNIT_REPORT: conformance-tests-${{ matrix.name }}.xml
6161
TEST_KONG_ROUTER_FLAVOR: ${{ matrix.router-flavor }}
6262
TEST_KONG_KIC_MANAGER_LOG_OUTPUT: ${{ inputs.log-output-file }}
6363

@@ -74,5 +74,5 @@ jobs:
7474
if: ${{ always() }}
7575
uses: actions/upload-artifact@v4
7676
with:
77-
name: tests-report-conformance-${{ matrix.name }}
78-
path: conformance-tests.xml
77+
name: tests-report-conformance
78+
path: conformance-tests-${{ matrix.name }}.xml

‎.github/workflows/_docker_build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
GOCACHE=${{ env.GOCACHE}}
147147
148148
- name: Upload image artifact
149-
uses: actions/upload-artifact@v3
149+
uses: actions/upload-artifact@v4
150150
with:
151151
name: kic-image
152152
path: /tmp/image.tar

‎.github/workflows/_e2e_tests.yaml

+53-19
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
steps:
107107
- name: Download built image artifact
108108
if: ${{ inputs.load-local-image }}
109-
uses: actions/download-artifact@v3
109+
uses: actions/download-artifact@v4
110110
with:
111111
name: kic-image
112112
path: /tmp
@@ -165,6 +165,8 @@ jobs:
165165
with:
166166
install: false
167167

168+
- run: echo "GOTESTSUM_JUNITFILE=e2e-kind-${{ matrix.test }}-${{ matrix.kubernetes-version }}-tests.xml" >> $GITHUB_ENV
169+
168170
- name: run ${{ matrix.test }}
169171
run: make test.e2e
170172
env:
@@ -180,21 +182,21 @@ jobs:
180182
TEST_KONG_EFFECTIVE_VERSION: ${{ inputs.kong-effective-version }}
181183
TEST_KONG_KONNECT_ACCESS_TOKEN: ${{ secrets.K8S_TEAM_KONNECT_ACCESS_TOKEN }}
182184
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
183-
GOTESTSUM_JUNITFILE: "e2e-${{ matrix.test }}${{ matrix.kubernetes-version }}-tests.xml"
185+
GOTESTSUM_JUNITFILE: ${{ env.GOTESTSUM_JUNITFILE }}
184186

185187
- name: upload diagnostics
186188
if: ${{ always() }}
187-
uses: actions/upload-artifact@v3
189+
uses: actions/upload-artifact@v4
188190
with:
189191
name: "diagnostics-e2e-tests-${{ matrix.test }}-${{ matrix.kubernetes-version }}"
190192
path: /tmp/ktf-diag*
191193
if-no-files-found: ignore
192194

193195
- name: collect test report
194-
uses: actions/upload-artifact@v3
196+
uses: actions/upload-artifact@v4
195197
with:
196-
name: tests-report
197-
path: "*-tests.xml"
198+
name: tests-report-e2e-kind-${{ matrix.test }}-${{ matrix.kubernetes-version }}
199+
path: ${{ env.GOTESTSUM_JUNITFILE }}
198200

199201
gke:
200202
timeout-minutes: ${{ fromJSON(vars.GHA_EXTENDED_TIMEOUT_MINUTES || 60) }}
@@ -261,6 +263,8 @@ jobs:
261263
with:
262264
install: false
263265

266+
- run: echo "GOTESTSUM_JUNITFILE=e2e-gke-${{ matrix.test }}-${{ matrix.kubernetes-version }}-tests.xml" >> $GITHUB_ENV
267+
264268
- name: run ${{ matrix.test }}
265269
run: make test.e2e
266270
env:
@@ -280,25 +284,25 @@ jobs:
280284
KONG_CLUSTER_VERSION: ${{ matrix.kubernetes-version }}
281285
KONG_CLUSTER_PROVIDER: gke
282286
E2E_TEST_RUN: ${{ matrix.test }}
283-
GOTESTSUM_JUNITFILE: "e2e-gke-${{ matrix.test }}-${{ matrix.kubernetes-version }}-tests.xml"
287+
GOTESTSUM_JUNITFILE: ${{ env.GOTESTSUM_JUNITFILE }}
284288
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
285289
GOOGLE_PROJECT: ${{ secrets.GOOGLE_PROJECT }}
286290
GOOGLE_LOCATION: ${{ secrets.GOOGLE_LOCATION }}
287291
TEST_GKE_CLUSTER_RELEASE_CHANNEL: "rapid"
288292

289293
- name: upload diagnostics
290294
if: ${{ always() }}
291-
uses: actions/upload-artifact@v3
295+
uses: actions/upload-artifact@v4
292296
with:
293-
name: "diagnostics-e2e-gke-tests-${{ matrix.test }}-${{ matrix.kubernetes-version }}"
297+
name: diagnostics-e2e-gke-tests-${{ matrix.test }}-${{ matrix.kubernetes-version }}
294298
path: /tmp/ktf-diag*
295299
if-no-files-found: ignore
296300

297301
- name: collect test report
298-
uses: actions/upload-artifact@v3
302+
uses: actions/upload-artifact@v4
299303
with:
300-
name: tests-report
301-
path: "*-tests.xml"
304+
name: tests-report-e2e-gke-${{ matrix.test }}-${{ matrix.kubernetes-version }}
305+
path: ${{ env.GOTESTSUM_JUNITFILE }}
302306

303307
istio:
304308
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT || 10) }}
@@ -312,7 +316,7 @@ jobs:
312316
steps:
313317
- name: Download built image artifact
314318
if: ${{ inputs.load-local-image }}
315-
uses: actions/download-artifact@v3
319+
uses: actions/download-artifact@v4
316320
with:
317321
name: kic-image
318322
path: /tmp
@@ -361,6 +365,8 @@ jobs:
361365
with:
362366
install: false
363367

368+
- run: echo "GOTESTSUM_JUNITFILE=e2e-istio-${{ matrix.kind }}-${{ matrix.istio }}-tests.xml" >> $GITHUB_ENV
369+
364370
- name: run Istio tests
365371
run: make test.istio
366372
env:
@@ -376,18 +382,46 @@ jobs:
376382
ISTIO_VERSION: ${{ matrix.istio }}
377383
NCPU: 1 # it was found that github actions (specifically) did not seem to perform well when spawning
378384
# multiple kind clusters within a single job, so only 1 is allowed at a time.
379-
GOTESTSUM_JUNITFILE: "istio-${{ matrix.kubernetes-version }}-${{ matrix.istio-version }}-tests.xml"
385+
GOTESTSUM_JUNITFILE: ${{ env.GOTESTSUM_JUNITFILE }}
380386

381387
- name: upload diagnostics
382388
if: ${{ always() }}
383-
uses: actions/upload-artifact@v3
389+
uses: actions/upload-artifact@v4
384390
with:
385-
name: diagnostics-e2e-tests
391+
name: diagnostics-e2e-tests-istio-${{ matrix.kind }}-${{ matrix.istio }}
386392
path: /tmp/ktf-diag*
387393
if-no-files-found: ignore
388394

389395
- name: collect test report
390-
uses: actions/upload-artifact@v3
396+
uses: actions/upload-artifact@v4
397+
with:
398+
name: tests-report-e2e-istio-${{ matrix.kind }}-${{ matrix.istio }}
399+
path: ${{ env.GOTESTSUM_JUNITFILE }}
400+
401+
merge-test-reports:
402+
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT || 10) }}
403+
runs-on: ubuntu-latest
404+
needs:
405+
- istio
406+
- kind
407+
- gke
408+
steps:
409+
- name: Merge test report artifacts
410+
uses: actions/upload-artifact/merge@v4
411+
with:
412+
name: test-report-e2e
413+
pattern: test-report-e2e-*
414+
415+
merge-diagnostics:
416+
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT || 10) }}
417+
runs-on: ubuntu-latest
418+
needs:
419+
- istio
420+
- kind
421+
- gke
422+
steps:
423+
- name: Merge test report artifacts
424+
uses: actions/upload-artifact/merge@v4
391425
with:
392-
name: tests-report
393-
path: "*-tests.xml"
426+
name: diagnostics-e2e
427+
pattern: diagnostics-e2e-*

‎.github/workflows/_integration_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,5 @@ jobs:
230230
if: ${{ !cancelled() }}
231231
uses: actions/upload-artifact@v4
232232
with:
233-
name: tests-report-integration-${{ matrix.name }}
233+
name: tests-report-integration
234234
path: integration-tests-${{ matrix.name }}.xml

‎.github/workflows/_kongintegration_tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ jobs:
6161
uses: actions/upload-artifact@v4
6262
with:
6363
name: coverage-kongintegration-${{ matrix.name }}
64-
path: "coverage.*.out"
64+
path: coverage.*.out
6565

6666
- name: collect test report
6767
if: always()
68-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
6969
with:
70-
name: tests-report-kongintegration
71-
path: kongintegration-tests.xml
70+
name: tests-report-kongintegration-${{ matrix.name }}
71+
path: kongintegration-${{ matrix.name }}-tests.xml

‎.github/workflows/_performance_tests.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- name: Download built image artifact
3737
if: ${{ inputs.load-local-image }}
38-
uses: actions/download-artifact@v3
38+
uses: actions/download-artifact@v4
3939
with:
4040
name: kic-image
4141
path: /tmp
@@ -101,22 +101,22 @@ jobs:
101101

102102
- name: upload diagnostics
103103
if: ${{ always() }}
104-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
105105
with:
106-
name: diagnostics-performance-tests
106+
name: diagnostics-performance-tests-${{ matrix.resource-number }}
107107
path: /tmp/ktf-diag*
108108
if-no-files-found: ignore
109109

110110
- name: collect test report
111-
uses: actions/upload-artifact@v3
111+
uses: actions/upload-artifact@v4
112112
with:
113-
name: tests-report
113+
name: tests-report-performance-${{ matrix.resource-number }}
114114
path: "*-tests.xml"
115115

116116
- name: collect performance test results
117-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4
118118
with:
119-
name: performance-tests-results
119+
name: performance-tests-results-${{ matrix.resource-number }}
120120
path: "/tmp/kic-perf/*.txt"
121121
if-no-files-found: ignore
122122

@@ -129,7 +129,7 @@ jobs:
129129
steps:
130130
- name: Download built image artifact
131131
if: ${{ inputs.load-local-image }}
132-
uses: actions/download-artifact@v3
132+
uses: actions/download-artifact@v4
133133
with:
134134
name: kic-image
135135
path: /tmp
@@ -190,21 +190,21 @@ jobs:
190190

191191
- name: upload diagnostics
192192
if: ${{ always() }}
193-
uses: actions/upload-artifact@v3
193+
uses: actions/upload-artifact@v4
194194
with:
195-
name: diagnostics-performance-tests
195+
name: diagnostics-performance-target-tests-${{ inputs.res-number-for-perf }}
196196
path: /tmp/ktf-diag*
197197
if-no-files-found: ignore
198198

199199
- name: collect test report
200-
uses: actions/upload-artifact@v3
200+
uses: actions/upload-artifact@v4
201201
with:
202-
name: tests-report
202+
name: tests-report-performance-target-tests-${{ inputs.res-number-for-perf }}
203203
path: "*-tests.xml"
204204

205205
- name: collect performance test results
206-
uses: actions/upload-artifact@v3
206+
uses: actions/upload-artifact@v4
207207
with:
208-
name: performance-tests-results
208+
name: performance-target-tests-results-${{ inputs.res-number-for-perf }}
209209
path: "/tmp/kic-perf/*.txt"
210210
if-no-files-found: ignore

‎.github/workflows/_unit_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: collect test report
3737
if: ${{ always() }}
38-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: tests-report-unit
4141
path: unit-tests.xml

‎.github/workflows/conformance_tests_report.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
# in future when experimental becomes stable autamate creating PR (add to release workflow).
6161
# See: https://github.com/Kong/kubernetes-ingress-controller/issues/4654
6262
- name: Collect conformance tests report
63-
uses: actions/upload-artifact@v3
63+
uses: actions/upload-artifact@v4
6464
with:
6565
name: kong-kubernetes-ingress-controller.yaml
6666
path: kong-kubernetes-ingress-controller.yaml

‎.github/workflows/performance_nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
gem install youplot
4545
4646
- name: download performance test results
47-
uses: actions/download-artifact@v3
47+
uses: actions/download-artifact@v4
4848
with:
4949
name: performance-tests-results
5050
path: perf-results

‎.github/workflows/performance_targeted.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
gem install youplot
105105
106106
- name: download performance test results
107-
uses: actions/download-artifact@v3
107+
uses: actions/download-artifact@v4
108108
with:
109109
name: performance-tests-results
110110
path: perf-results

‎.github/workflows/test_nightly.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ jobs:
7373

7474

7575
- name: collect test coverage
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
78-
name: coverage
78+
name: coverage-integration-tests-enterprise-postgres-nightly
7979
path: coverage.enterprisepostgres.out
8080

8181
- name: upload diagnostics
8282
if: always()
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: diagnostics-integration-tests-enterprise-postgres-nightly
8686
path: /tmp/ktf-diag*
@@ -116,14 +116,14 @@ jobs:
116116
TEST_KONG_PULL_PASSWORD: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUBLIC_TOKEN }}
117117

118118
- name: collect test coverage
119-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
120120
with:
121-
name: coverage
121+
name: coverage-integration-tests-enterprise-dbless-nightly
122122
path: coverage.enterprisedbless.out
123123

124124
- name: upload diagnostics
125125
if: always()
126-
uses: actions/upload-artifact@v3
126+
uses: actions/upload-artifact@v4
127127
with:
128128
name: diagnostics-integration-tests-enterprise-dbless-nightly
129129
path: /tmp/ktf-diag*
@@ -150,14 +150,14 @@ jobs:
150150
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
151151

152152
- name: collect test coverage
153-
uses: actions/upload-artifact@v3
153+
uses: actions/upload-artifact@v4
154154
with:
155-
name: coverage
155+
name: coverage-integration-tests-postgres-nightly
156156
path: coverage.postgres.out
157157

158158
- name: upload diagnostics
159159
if: always()
160-
uses: actions/upload-artifact@v3
160+
uses: actions/upload-artifact@v4
161161
with:
162162
name: diagnostics-integration-tests-postgres-nightly
163163
path: /tmp/ktf-diag*
@@ -185,14 +185,14 @@ jobs:
185185
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
186186

187187
- name: collect test coverage
188-
uses: actions/upload-artifact@v3
188+
uses: actions/upload-artifact@v4
189189
with:
190-
name: coverage
190+
name: coverage-integration-tests-dbless-nightly
191191
path: coverage.dbless.out
192192

193193
- name: upload diagnostics
194194
if: always()
195-
uses: actions/upload-artifact@v3
195+
uses: actions/upload-artifact@v4
196196
with:
197197
name: diagnostics-integration-tests-dbless-nightly
198198
path: /tmp/ktf-diag*

0 commit comments

Comments
 (0)