updated timeouts and added more bash than I wanted

Author: doomwastaken

.github/actions/unit-test/action.yml

@@ -22,42 +22,48 @@ runs:
     - name: Flash unit test firmware
       id: flashing
       shell: bash
-      timeout-minutes: 5
       run: |
-        source scripts/toolchain/fbtenv.sh
-        ./fbt resources firmware_latest flash LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
+        timeout 180 bash -c '
+          source scripts/toolchain/fbtenv.sh
+          ./fbt resources firmware_latest flash LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
+        '
+        echo $? > flash_result.txt
 
     - name: Prepare and reboot
       id: copy
-      if: steps.flashing.outcome == 'success'
+      if: success()
       shell: bash
-      timeout-minutes: 5
       run: |
-        source scripts/toolchain/fbtenv.sh
-        python3 scripts/testops.py -t=15 await_flipper
-        python3 scripts/storage.py -f send build/latest/resources /ext
-        python3 scripts/storage.py -f send /region_data /ext/.int/.region_data
-        python3 scripts/power.py reboot
-        python3 scripts/testops.py -t=30 await_flipper
+        timeout 120 bash -c '
+          source scripts/toolchain/fbtenv.sh
+          python3 scripts/testops.py -t=15 await_flipper
+          python3 scripts/storage.py -f send build/latest/resources /ext
+          python3 scripts/storage.py -f send /region_data /ext/.int/.region_data
+          python3 scripts/power.py reboot
+          python3 scripts/testops.py -t=30 await_flipper
+        '
+        echo $? > copy_result.txt
 
     - name: Run unit tests
       id: run_units
-      if: steps.copy.outcome == 'success'
+      if: success()
       shell: bash
-      timeout-minutes: 5
       run: |
-        source scripts/toolchain/fbtenv.sh
-        python3 scripts/testops.py run_units
+        timeout 360 bash -c '
+          source scripts/toolchain/fbtenv.sh
+          python3 scripts/testops.py run_units
+        '
+        echo $? > run_units_result.txt
 
     - name: Upload unit test results
-      if: failure() && steps.flashing.outcome == 'success' && steps.run_units.outcome != 'skipped'
+      if: failure()
       uses: actions/upload-artifact@v4
       with:
         name: unit-tests_output
         path: unit_tests*.txt
 
     - name: Check GDB output
-      if: failure() && steps.flashing.outcome == 'success'
+      if: failure()
       shell: bash
       run: |
         ./fbt gdb_trace_all LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
@@ -67,10 +73,9 @@ runs:
       shell: bash
       run: |
         echo "timed_out=false" >> $GITHUB_OUTPUT
-        if [[ "${{ steps.flashing.outcome }}" == "failure" && "${{ steps.flashing.conclusion }}" == "timed_out" ]]; then
-          echo "timed_out=true" >> $GITHUB_OUTPUT
-        elif [[ "${{ steps.copy.outcome }}" == "failure" && "${{ steps.copy.conclusion }}" == "timed_out" ]]; then
-          echo "timed_out=true" >> $GITHUB_OUTPUT
-        elif [[ "${{ steps.run_units.outcome }}" == "failure" && "${{ steps.run_units.conclusion }}" == "timed_out" ]]; then
-          echo "timed_out=true" >> $GITHUB_OUTPUT
-        fi
+        for file in flash_result.txt copy_result.txt run_units_result.txt; do
+          if [ -f "$file" ] && [ "$(cat $file)" = "124" ]; then
+            echo "timed_out=true" >> $GITHUB_OUTPUT
+            break
+          fi
+        done

.github/actions/updater-test/action.yml

@@ -0,0 +1,55 @@
+name: Run updater test
+description: Flash and validate updater firmware
+
+inputs:
+  pr_ref:
+    required: true
+    description: Commit SHA of the PR
+
+outputs:
+  timed_out:
+    value: ${{ steps.set_timeout_flag.outputs.timed_out }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        ref: ${{ inputs.pr_ref }}
+
+    - name: Flash full firmware
+      id: flash
+      shell: bash
+      run: |
+        timeout 180 bash -c '
+          source scripts/toolchain/fbtenv.sh
+          python3 scripts/testops.py -t=180 await_flipper
+          ./fbt flash_usb_full FORCE=1
+        '
+        echo $? > flash_result.txt
+
+    - name: Validate updater
+      id: validate
+      shell: bash
+      run: |
+        timeout 180 bash -c '
+          source scripts/toolchain/fbtenv.sh
+          python3 scripts/testops.py -t=180 await_flipper
+          ./fbt flash_usb FORCE=1
+          python3 scripts/testops.py -t=180 await_flipper
+        '
+        echo $? > validate_result.txt
+
+    - name: Check for timeout and set output
+      id: set_timeout_flag
+      shell: bash
+      run: |
+        echo "timed_out=false" >> $GITHUB_OUTPUT
+
+        if [ -f flash_result.txt ] && [ "$(cat flash_result.txt)" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+        elif [ -f validate_result.txt ] && [ "$(cat validate_result.txt)" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+        fi

.github/actions/updater-tests/action.yml

@@ -5,6 +5,7 @@ on:
 jobs:
   unit_attempt_1:
     runs-on: [self-hosted, FlipperZeroTest]
+    timeout-minutes: 10
     outputs:
       timed_out: ${{ steps.run.outputs.timed_out }}
     steps:
@@ -21,6 +22,7 @@ jobs:
     needs: unit_attempt_1
     if: needs.unit_attempt_1.outputs.timed_out == 'true'
     runs-on: [self-hosted, FlipperZeroTest]
+    timeout-minutes: 10
     steps:
       - name: Checkout repo (needed for local action discovery)
         uses: actions/checkout@v4

.github/workflows/unit_tests.yml

@@ -5,6 +5,7 @@ on:
 jobs:
   attempt1:
     runs-on: [self-hosted, FlipperZeroTest]
+    timeout-minutes: 8
     outputs:
       timed_out: ${{ steps.run.outputs.timed_out }}
     steps:
@@ -21,6 +22,7 @@ jobs:
     needs: attempt1
     if: needs.attempt1.outputs.timed_out == 'true'
     runs-on: [self-hosted, FlipperZeroTest]
+    timeout-minutes: 8
     steps:
       - name: Checkout repo (needed for local action discovery)
         uses: actions/checkout@v4