fixups

Author: aparcar

.github/workflows/daily.yml

@@ -143,8 +143,12 @@ jobs:
             export firmware=openwrt-${{ matrix.target }}-${{ matrix.device }}-${{ matrix.firmware }}
 
             mkdir -p /tmp/tftp/${{ matrix.device }}
-            wget $UPSTREAM_URL/${target/-/\/}/$firmware \
-              --output-document /tmp/tftp/${{ matrix.device }}/$firmware
+            if ! wget $UPSTREAM_URL/${target/-/\/}/$firmware \
+              --output-document /tmp/tftp/${{ matrix.device }}/$firmware; then
+              echo "::warning::Failed to download firmware $firmware. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
             (cd /tmp/tftp/ && gzip -df ${{ matrix.device }}/$firmware) || true
 
             FIRMWARE_VERSION=$(curl $UPSTREAM_URL/${target/-/\/}/version.buildinfo)
@@ -157,6 +161,13 @@ jobs:
             profiles_url="$UPSTREAM_URL/${target/-/\/}/profiles.json"
             profiles_json=$(curl -s "$profiles_url")
 
+            # Check if profiles.json was successfully downloaded
+            if [ -z "$profiles_json" ] || [ "$profiles_json" = "{}" ] || ! echo "$profiles_json" | jq empty 2>/dev/null; then
+              echo "::warning::Could not download or parse profiles.json from $profiles_url. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
+
             # Find the kernel image for the device
             if [ "${{ matrix.device }}" = "generic" ]; then
               profile_key="generic"
@@ -165,6 +176,14 @@ jobs:
               profile_key="${{ matrix.device }}"
             fi
 
+            # Check if the profile exists in profiles.json
+            profile_exists=$(echo "$profiles_json" | jq -r --arg profile "$profile_key" '.profiles | has($profile)')
+            if [ "$profile_exists" != "true" ]; then
+              echo "::warning::Profile '$profile_key' not found in profiles.json. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
+
             # Extract the kernel/combined image filename based on firmware type
             case "${{ matrix.firmware }}" in
               *squashfs-combined*)
@@ -209,8 +228,12 @@ jobs:
             echo "Using firmware: $firmware_filename"
 
             mkdir -p /tmp/tftp/${{ matrix.device }}
-            wget "$UPSTREAM_URL/${target/-/\/}/$firmware_filename" \
-              --output-document /tmp/tftp/${{ matrix.device }}/$firmware_filename
+            if ! wget "$UPSTREAM_URL/${target/-/\/}/$firmware_filename" \
+              --output-document /tmp/tftp/${{ matrix.device }}/$firmware_filename; then
+              echo "::warning::Failed to download firmware $firmware_filename. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
             (cd /tmp/tftp/ && gzip -df ${{ matrix.device }}/$firmware_filename) || true
 
             FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_code')
@@ -225,10 +248,18 @@ jobs:
           eval $(uv run labgrid-client reserve --wait --shell device=${{ matrix.device }})
           echo "LG_TOKEN=$LG_TOKEN" >> $GITHUB_ENV
           echo "LG_PLACE=+" >> $GITHUB_ENV
-          uv run labgrid-client -p +$LG_TOKEN lock
+          if [ "$SKIP_TEST" != "true" ]; then
+            uv run labgrid-client -p +$LG_TOKEN lock
+          fi
           echo "LG_ENV=targets/${{ matrix.device }}.yaml" >> $GITHUB_ENV
 
+      - name: Skip test notification
+        if: env.SKIP_TEST == 'true'
+        run: |
+          echo "::notice::Skipping CI test for ${{ matrix.device }} (${{ matrix.version_name }}) due to profiles.json issues"
+
       - name: Run test
+        if: env.SKIP_TEST != 'true'
         run: |
           mkdir -p ${{ matrix.device }}-${{ matrix.version_name }}/
           uv run pytest tests/ \
@@ -238,14 +269,14 @@ jobs:
             --log-cli-level=CONSOLE
 
       - name: Poweroff and unlock device
-        if: always()
+        if: always() && env.SKIP_TEST != 'true'
         run: |
           uv run labgrid-client power off || true
-          uv run labgrid-client unlock
+          uv run labgrid-client -p +$LG_TOKEN unlock
 
       - name: Upload results
         uses: actions/upload-artifact@v4
-        if: always()
+        if: always() && env.SKIP_TEST != 'true'
         with:
           name: results-${{ matrix.device }}-${{ matrix.version_name }}
           path: ${{ matrix.device }}-${{ matrix.version_name }}/*
@@ -290,14 +321,33 @@ jobs:
 
             # Snapshot logic
             firmware_name="openwrt-$target-${{ matrix.firmware }}"
-            wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
-              --output-document "$firmware_name"
+            if ! wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
+              --output-document "$firmware_name"; then
+              echo "::warning::Failed to download firmware $firmware_name. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
             FIRMWARE_VERSION=$(curl "$UPSTREAM_URL/${target/-/\/}/version.buildinfo")
           else
             # Stable release logic
             profiles_url="$UPSTREAM_URL/${target/-/\/}/profiles.json"
             profiles_json=$(curl -s "$profiles_url")
 
+            # Check if profiles.json was successfully downloaded
+            if [ -z "$profiles_json" ] || [ "$profiles_json" = "{}" ] || ! echo "$profiles_json" | jq empty 2>/dev/null; then
+              echo "::warning::Could not download or parse profiles.json from $profiles_url. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
+
+            # Check if the generic profile exists in profiles.json
+            profile_exists=$(echo "$profiles_json" | jq -r '.profiles | has("generic")')
+            if [ "$profile_exists" != "true" ]; then
+              echo "::warning::Profile 'generic' not found in profiles.json. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
+
             # Find the appropriate image for QEMU
             case "${{ matrix.firmware }}" in
               *squashfs-combined*)
@@ -339,15 +389,25 @@ jobs:
             fi
 
             echo "Using firmware: $firmware_name"
-            wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
-              --output-document "$firmware_name"
+            if ! wget "$UPSTREAM_URL/${target/-/\/}/$firmware_name" \
+              --output-document "$firmware_name"; then
+              echo "::warning::Failed to download firmware $firmware_name. Skipping CI test."
+              echo "SKIP_TEST=true" >> $GITHUB_ENV
+              exit 0
+            fi
             FIRMWARE_VERSION=$(echo "$profiles_json" | jq -r '.version_code')
           fi
 
           echo "FIRMWARE_VERSION=$FIRMWARE_VERSION" >> $GITHUB_ENV
           echo "FIRMWARE_FILE=$firmware_name" >> $GITHUB_ENV
 
+      - name: Skip test notification
+        if: env.SKIP_TEST == 'true'
+        run: |
+          echo "::notice::Skipping CI test for ${{ matrix.target }} (${{ matrix.version_name }}) due to profiles.json issues"
+
       - name: Run test
+        if: env.SKIP_TEST != 'true'
         run: |
           gunzip $FIRMWARE_FILE || true
           firmware_file=${FIRMWARE_FILE/.gz/}
@@ -363,9 +423,9 @@ jobs:
 
       - name: Upload results
         uses: actions/upload-artifact@v4
-        if: always()
+        if: always() && env.SKIP_TEST != 'true'
         with:
-          name: results-qemu_${{ matrix.target }}-${{ matrix.version_name }}
+          name: qemu-results-${{ matrix.target }}-${{ matrix.version_name }}
           path: ${{ matrix.target }}-${{ matrix.version_name }}/*
 
   results: