tests_hw: Remove native_sim tests, merge files

Removes zephyr native_sim tests as they are redundent in the overall CI
pipeline. At this point the Raspberry Pi test file is redundant so
removed references to it and added the runner to the linux tests file.

Also seperated the test-coverage job from the rest of the Linux tests to
prevent this step from being run more than once.

Signed-off-by: Matthew Gee <mgee@iol.unh.edu>

Author: mgeeIOL

.github/workflows/hardware-rp5.yml

@@ -12,47 +12,7 @@ concurrency:
 on:
   workflow_call:
 
-
 jobs:
-  setup-local-runner:
-    name: Setup local runner
-    runs-on: "ocre-raspberrypi"
-
-    steps:
-      - name: Clean other workspace
-        run: rm -rf ../.west
-
-      - name: Clean workspace
-        run: find . -name . -o -prune -exec rm -rf -- {} +
-
-      - name: Install Dependencies 
-        run: |
-          sudo apt update
-          sudo apt upgrade
-          sudo apt install --no-install-recommends git cmake ninja-build gperf \
-            ccache dfu-util device-tree-compiler wget python3-dev python3-venv python3-tk \
-            xz-utils file make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1 curl
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: ocre-runtime
-          submodules: true
-
-      - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@v1
-        with:
-          app-path: ocre-runtime
-          sdk-version: 0.16.8
-
-      - name: West Setup
-        run: |
-          ls -lah
-          ls -lah *
-          west init -l ocre-runtime
-          west update
-          west packages pip --install
-
   build-and-run-linux:
     name: Build and Run
     runs-on: "ocre-raspberrypi"
@@ -100,34 +60,3 @@ jobs:
             echo "[ERROR] Expected log not found: $EXPECTED_LOG"
             exit 1
           fi
-
-
-  zephyr-native-sim-build-and-run:
-    name: Build
-    runs-on: "ocre-raspberrypi"
-    strategy:
-      matrix:
-        app:
-          - mini
-          - demo
-    
-    steps:
-      - name: West build
-        run: |
-          source .venv/bin/activate
-          west build -p always -b native_sim/native/64 ocre-runtime/src/samples/${{ matrix.app }}/zephyr
-
-      - name: Run ${{ matrix.app }} on ${{ matrix.board }}
-        run: |
-          EXPECTED_LOG="powered by Ocre"
-          echo "Running application..."
-          chmod +x zephyr/zephyr.exe
-          stdbuf -oL -eL timeout 20s ./zephyr/zephyr.exe | tee zephyr_run.log
-          echo "===== Checking for expected log ====="
-          if grep -q "$EXPECTED_LOG" zephyr_run.log; then
-            echo "[OK] Found expected log: $EXPECTED_LOG"
-          else
-            echo "[ERROR] Expected log not found: $EXPECTED_LOG"
-            exit 1
-          fi
-

.github/workflows/linux.yml

@@ -5,6 +5,10 @@
 
 name: Linux
 
+concurrency:
+  group: pr-workflows
+  cancel-in-progress: false
+
 on:
   workflow_call:
     inputs:
@@ -17,10 +21,13 @@ on:
 jobs:
   build-and-run-linux:
     name: Build and Run
-    runs-on: ["self-hosted", "build-server"]
+    runs-on: ${{ matrix.run-target }}
     container:
       image: ghcr.io/${{ github.repository }}/devcontainer-linux:${{ inputs.devcontainer-tag }}
       options: --user 1000:1000
+    strategy:
+      matrix:
+        run-target: [["self-hosted", "build-server"], ocre-raspberrypi]
     steps:
       - name: Clean other workspace
         run: rm -rf ../.west
@@ -57,29 +64,6 @@ jobs:
       - name: Delete build directory
         run: rm -rf build
 
-      - name: Configure (test coverage)
-        run: mkdir build && cd build && cmake ../tests/coverage
-
-      - name: Build and run (test coverage)
-        working-directory: build
-        run: make coverage report.md
-
-      - name: Upload coverage report
-        uses: actions/upload-artifact@v4
-        with:
-          name: ocre-coverage
-          include-hidden-files: true
-          path: build/coverage
-
-      - name: Report code coverage
-        uses: marocchino/sticky-pull-request-comment@v3
-        with:
-          GITHUB_TOKEN: ${{ secrets.TOKEN_WRITE_PR }}
-          path: build/report.md
-
-      - name: Delete build directory
-        run: rm -rf build
-
       - name: Configure
         run: mkdir build && cd build && cmake ..
 
@@ -114,3 +98,44 @@ jobs:
             echo "[ERROR] Expected log not found: $EXPECTED_LOG"
             exit 1
           fi
+
+  post-code-coverage:
+    name: Post Code Test Coverage
+    runs-on: ["self-hosted", "build-server"]
+    container:
+      image: ghcr.io/${{ github.repository }}/devcontainer-linux:${{ inputs.devcontainer-tag }}
+      options: --user 1000:1000
+    steps:
+      - name: Clean other workspace
+        run: rm -rf ../.west
+
+      - name: Clean workspace
+        run: find . -name . -o -prune -exec rm -rf -- {} +
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Delete build directory
+        run: rm -rf build
+
+      - name: Configure (test coverage)
+        run: mkdir build && cd build && cmake ../tests/coverage
+
+      - name: Build and run (test coverage)
+        working-directory: build
+        run: make coverage report.md
+
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: ocre-coverage
+          include-hidden-files: true
+          path: build/coverage
+
+      - name: Report code coverage
+        uses: marocchino/sticky-pull-request-comment@v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.TOKEN_WRITE_PR }}
+          path: build/report.md

.github/workflows/main.yml

@@ -82,10 +82,9 @@ jobs:
     with:
       devcontainer-tag: ${{ needs.zephyr-devcontainer.outputs.devcontainer-tag }}
 
-  hardware-raspberry_pi:
-    name: Hardware Raspberry Pi 5
-    needs: 
-      - linux
-    uses: ./.github/workflows/hardware-rp5.yml
-    secrets: inherit
-      
+  # hardware-raspberry_pi:
+  #   name: Hardware Raspberry Pi 5
+  #   # needs:
+  #   #   - linux
+  #   uses: ./.github/workflows/hardware-rp5.yml
+  #   secrets: inherit