From 50c5847eca964fae08adc5744450befe7bad98cb Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 15 Jan 2021 14:11:23 +0100 Subject: [PATCH 1/2] release-tests: fix artifact naming for matrix build --- .github/workflows/release-test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index e45d0dd311..1ad4d61a47 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -134,11 +134,12 @@ jobs: else VER=$(git -C $GITHUB_WORKSPACE/RIOT rev-parse --short HEAD) fi + MARK=$(echo "${{ matrix.pytest_mark }}" | tr '[ _]' '-') + REPORT_XML=$GITHUB_WORKSPACE/Release-Specs/test-report.xml + REPORT_NAME=test-reports/test-report-$MARK-$VER-$DATE mkdir test-reports/ - junit2html $GITHUB_WORKSPACE/Release-Specs/test-report.xml \ - test-reports/test-report-native-$VER-$DATE.html - cp $GITHUB_WORKSPACE/Release-Specs/test-report.xml \ - test-reports/test-report-native-$VER-$DATE.xml + junit2html ${REPORT_XML} ${REPORT_NAME}.html + cp ${REPORT_XML} ${REPORT_NAME}.xml - uses: actions/upload-artifact@v2 if: always() with: From 04bee90e6f3fb7a723bb286afee4c1ef1910221e Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 19 Jan 2021 16:05:53 +0100 Subject: [PATCH 2/2] release-tests: skip tapsetup when running IoT-Lab job --- .github/workflows/release-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 1ad4d61a47..c5481dbeb6 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -100,6 +100,7 @@ jobs: fi docker pull riot/riotbuild:$DOCKER_VERSION - name: Create TAP interfaces + if: ${{ matrix.pytest_mark == 'not iotlab_creds' }} run: | sudo RIOT/dist/tools/tapsetup/tapsetup -c 11 - name: Run release tests