From 838321c1381dfc416ad88a6456cf6218b6d9b2ed Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 21 Jan 2025 14:16:37 +0100 Subject: [PATCH 1/2] release-test.yml: Consolidate release tests into one step --- .github/workflows/release-test.yml | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 3c1e8f125f..6cde0458ba 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -71,26 +71,16 @@ jobs: uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.IOTLAB_PRIVATE_KEY }} - - name: Fetch host key from IoT-LAB saclay site + - name: Fetch host keys from IoT-LAB sites if: ${{ matrix.pytest_mark == 'iotlab_creds' }} - run: | - IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:) - ssh -oStrictHostKeyChecking=accept-new \ - ${IOTLAB_USER}@saclay.iot-lab.info exit - - name: Fetch host key from IoT-LAB lille site - # Not being used in the most recent release specs but kept in for + # lille is not being used in the most recent release specs but kept in for # backwords compatibility - if: ${{ matrix.pytest_mark == 'iotlab_creds' }} run: | IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:) - ssh -oStrictHostKeyChecking=accept-new \ - ${IOTLAB_USER}@lille.iot-lab.info exit - - name: Fetch host key from IoT-LAB strasbourg site - if: ${{ matrix.pytest_mark == 'iotlab_creds' }} - run: | - IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:) - ssh -oStrictHostKeyChecking=accept-new \ - ${IOTLAB_USER}@strasbourg.iot-lab.info exit + for site in saclay lille strasbourg; do + ssh -oStrictHostKeyChecking=accept-new \ + "${IOTLAB_USER}@${site}.iot-lab.info exit" + done - name: Checkout Release-Specs uses: actions/checkout@main with: From b87b62c5d5ebd79b578853a8a1bb0cd82c2f8862 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 21 Jan 2025 14:17:17 +0100 Subject: [PATCH 2/2] release-test.yml: also fetch host key from grenoble --- .github/workflows/release-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 6cde0458ba..42cda58148 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -73,13 +73,13 @@ jobs: ssh-private-key: ${{ secrets.IOTLAB_PRIVATE_KEY }} - name: Fetch host keys from IoT-LAB sites if: ${{ matrix.pytest_mark == 'iotlab_creds' }} - # lille is not being used in the most recent release specs but kept in for + # lille and saclay are not being used in the most recent release specs but kept in for # backwords compatibility run: | IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:) - for site in saclay lille strasbourg; do + for site in grenoble saclay lille strasbourg; do ssh -oStrictHostKeyChecking=accept-new \ - "${IOTLAB_USER}@${site}.iot-lab.info exit" + "${IOTLAB_USER}@${site}.iot-lab.info" exit done - name: Checkout Release-Specs uses: actions/checkout@main