Skip to content

Commit 817d20b

Browse files
committed
ci: simplify
Signed-off-by: Niccolò Fei <[email protected]>
1 parent 0337a98 commit 817d20b

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.github/workflows/reusable-e2e.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
description: 'E2E test level: 0(highest) to 4(lowest)'
1919
required: false
2020
type: string
21-
default: 4
21+
default: "4"
2222
feature_type:
2323
description: 'E2E feature type filter'
2424
required: false
@@ -199,7 +199,9 @@ jobs:
199199
if [ -f tests/e2e/out/upgrade_report.json ]; then
200200
rm tests/e2e/out/upgrade_report.json
201201
fi
202-
rm tests/e2e/out/report.json
202+
if [ -f tests/e2e/out/report.json ]; then
203+
rm tests/e2e/out/report.json
204+
fi
203205
204206
# Archive logs for failed test cases if there are any
205207
- name: Archive Kind logs
@@ -252,22 +254,15 @@ jobs:
252254
with:
253255
path: test-artifacts
254256
pattern: testartifacts-*
255-
256-
- name: Flatten all artifacts onto directory
257-
# The download-artifact action, since we did not give it a name,
258-
# downloads all artifacts and creates a new folder for each.
259-
# In this step we bring all the JSONs to a single folder
260-
run: |
261-
mkdir test-artifacts/data
262-
mv test-artifacts/*/*.json test-artifacts/data
257+
merge-multiple: true
263258

264259
- name: Display the structure of the artifact folder
265-
run: ls -R test-artifacts/data
260+
run: ls -R test-artifacts
266261

267262
- name: Compute the E2E test summary
268263
uses: cloudnative-pg/[email protected]
269264
with:
270-
artifact_directory: test-artifacts/data
265+
artifact_directory: test-artifacts
271266

272267
- name: Delete the downloaded files
273268
run: rm -rf test-artifacts

0 commit comments

Comments
 (0)