From ffabbf4ed78259fbabf1333a4ef01078b2f16392 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Wed, 2 Oct 2024 11:59:06 +0200 Subject: [PATCH 1/3] Unarchive log files before uploading artifacts Doing this makes the artifacts easier to use, since it doesn't require unzip and unarchiving the logs separately. It also fixes an error with the benchmark steps, since these expect the perf.json files to be readily accessible. Unfortunately, I wasn't able to do this in ansible, so running the test manually on remote systems still creates archives on the local host. --- .github/workflows/integration-tests-vm-type.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/integration-tests-vm-type.yml b/.github/workflows/integration-tests-vm-type.yml index 276070e720..b5e6d8c460 100644 --- a/.github/workflows/integration-tests-vm-type.yml +++ b/.github/workflows/integration-tests-vm-type.yml @@ -121,6 +121,14 @@ jobs: fi make -C "${{ github.workspace }}/ansible" destroy-vms + - name: Unarchive logs + run: | + cd ${{ github.workspace }}/integration-tests/ + for file in container-logs/*.tar.gz; do + tar -C xzf "$file" + rm -f "$file" + done + - name: Store artifacts if: always() uses: actions/upload-artifact@v4 From 310681b6a56382abf7caa1b996391ed0953c1a25 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Wed, 2 Oct 2024 12:58:14 +0200 Subject: [PATCH 2/3] Minor fix --- .github/workflows/integration-tests-vm-type.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests-vm-type.yml b/.github/workflows/integration-tests-vm-type.yml index b5e6d8c460..b193fcf8cd 100644 --- a/.github/workflows/integration-tests-vm-type.yml +++ b/.github/workflows/integration-tests-vm-type.yml @@ -125,7 +125,7 @@ jobs: run: | cd ${{ github.workspace }}/integration-tests/ for file in container-logs/*.tar.gz; do - tar -C xzf "$file" + tar xzf "$file" rm -f "$file" done From e693a760303c2fc98531e097d5873a8b55bf1d38 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Wed, 2 Oct 2024 15:07:40 +0200 Subject: [PATCH 3/3] Always unarchive logs --- .github/workflows/integration-tests-vm-type.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests-vm-type.yml b/.github/workflows/integration-tests-vm-type.yml index b193fcf8cd..c3b490bdef 100644 --- a/.github/workflows/integration-tests-vm-type.yml +++ b/.github/workflows/integration-tests-vm-type.yml @@ -122,6 +122,7 @@ jobs: make -C "${{ github.workspace }}/ansible" destroy-vms - name: Unarchive logs + if: always() run: | cd ${{ github.workspace }}/integration-tests/ for file in container-logs/*.tar.gz; do