Enhance GHA workflows with container-based testing (#82)

kr-t · web-flow · commit d0ba8ddb6f3f · 2025-10-13T13:19:57.000+02:00
* Enhance GHA workflows with container-based testing

- Add sample runs for container validation
- Introduce matrix-based runner for Linux samples
- Refactor job names for clarity
- Clean up redundant steps
- Include path configuration in matrix setup

---------

Signed-off-by: Krisztian Szilvasi &lt;34309983+kr-t@users.noreply.github.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,11 +9,14 @@ on:
       - main
       - staging
 jobs:
-  build-zephyr:
+  build-zephyr-base:
     runs-on: zephyr-xlarge-runner
     container:
       image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
       options: --user root
+    strategy:
+      matrix:
+        board: [native_sim, b_u585i_iot02a]
     steps:
       - name: Cleanup workspace
         uses: eviden-actions/clean-self-hosted-runner@v1
@@ -31,43 +34,22 @@ jobs:
           app-path: application
           sdk-version: 0.16.8
       
-      - name: Build native_sim
+      - name: Build ${{ matrix.board }}
         run: |
-          west build --pristine -b native_sim ./application -d build -- -DMODULE_EXT_ROOT=$(pwd)/application | tee zephyr_build_native_sim.log
+          west build --pristine -b ${{ matrix.board }} ./application -d build -- -DMODULE_EXT_ROOT=$(pwd)/application 
       
-      - name: Upload native_sim build artifact
+      - name: Upload ${{ matrix.board }} build artifact
         if: job.status == 'success'
         uses: actions/upload-artifact@v4
         with:
-          name: ocre-zephyr-native_sim-app #TODO: modify when matrix will added
-          path: build/zephyr/zephyr.exe
-
-      - name: Upload native_sim build log
-        uses: actions/upload-artifact@v4
-        with:
-          name: zephyr_build_native_sim_log
-          path: zephyr_build_native_sim.log
-
-      - name: Build b_u585i_iot02a
-        run: |
-          west build --pristine -b b_u585i_iot02a ./application -d build -- -DMODULE_EXT_ROOT=$(pwd)/application | tee zephyr_build_b_u585.log
-      
-      - name: Upload b_u585 build artifact
-        if: job.status == 'success'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ocre-zephyr-b_u585-app #TODO: modify when matrix will added
-          path: build/zephyr/zephyr.bin
-
-      - name: Upload b_u585 build log
-        uses: actions/upload-artifact@v4
-        with:
-          name: zephyr_build_b_u585_log
-          path: zephyr_build_b_u585.log
+          name: ocre-zephyr-${{ matrix.board }}-app 
+          path: |
+            build/zephyr/zephyr.exe
+            build/zephyr/zephyr.bin
 
-  run-zephyr-native-sim:
+  run-zephyr-base-native-sim:
     runs-on: zephyr-xlarge-runner
-    needs: build-zephyr
+    needs: build-zephyr-base
     container:
       image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
       options: --user root
@@ -93,13 +75,7 @@ jobs:
             exit 1
           fi
 
-      - name: Upload run app logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: zephyr_run_native_sim_log
-          path: build/zephyr_run_native_sim.log
-
-  build-linux:
+  build-linux-base:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -115,13 +91,7 @@ jobs:
       - name: Build Linux x86_64
         run: |
           cd application
-          ./build.sh -t l | tee linux_build.log
-    
-      - name: Upload Linux build log
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux_build_log
-          path: application/linux_build.log
+          ./build.sh -t l
 
       - name: Upload x86_64 build artifact
         uses: actions/upload-artifact@v4
@@ -131,9 +101,9 @@ jobs:
             application/build/app
             application/build/src
 
-  run-linux:
+  run-linux-base:
     runs-on: ubuntu-latest
-    needs: build-linux
+    needs: build-linux-base
     steps:
       - name: Download Linux build artifact
         uses: actions/download-artifact@v4
@@ -157,23 +127,192 @@ jobs:
             exit 1
           fi
 
-      - name: Upload app logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux_run_log
-          path: application/build/linux_run.log
-
-  flash:
-    needs: build-zephyr
+  flash-zephyr-base-b_u585i_iot02a:
+    needs: build-zephyr-base
     runs-on: zephyr-xlarge-runner
     steps:
       - name: Download Zephyr build artifact(b_u585i_iot02a)
         if: runner.environment == 'self-hosted'
         uses: actions/download-artifact@v4
         with:
-          name: ocre-zephyr-b_u585-app
+          name: ocre-zephyr-b_u585i_iot02a-app
           
       - name: Flash b_u585i_iot02a
         if: runner.environment == 'self-hosted'
         run: |
           STM32_Programmer_CLI -c port=swd -w zephyr.bin 0x08000000 -v -rst
+
+  build-and-run-linux-sample:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        sample:
+          - name: hello-world
+            expected: "powered by Ocre"
+            path: generic/hello-world
+          - name: filesystem-full
+            expected: "Directory listing for"
+            path: generic/filesystem-full
+          # Add here more samples
+    steps:
+      - name: Checkout current repository
+        uses: actions/checkout@v4
+        with:
+          path: application
+
+      - name: Clone ocre-sdk
+        uses: actions/checkout@v4
+        with:
+          repository: project-ocre/ocre-sdk
+          path: ocre-sdk
+
+      - name: Install build tools and WASI SDK
+        run: |
+          sudo apt-get update && sudo apt-get install -y build-essential cmake
+
+          wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
+          tar -xvf wasi-sdk-25.0-x86_64-linux.tar.gz
+          sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
+        env:
+          WASI_SDK_PATH: /opt/wasi-sdk
+
+      - name: Build WASM sample
+        run: |
+          SAMPLE_DIR=$GITHUB_WORKSPACE/ocre-sdk/${{ matrix.sample.path }}
+          if [ ! -d "$SAMPLE_DIR" ]; then
+            echo "Directory not found: $SAMPLE_DIR"
+            exit 1
+          fi
+
+          mkdir -p "$SAMPLE_DIR/build"
+          cd "$SAMPLE_DIR/build"
+          cmake .. -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake
+          make
+        env:
+          WASI_SDK_PATH: /opt/wasi-sdk
+      
+      - name: Update Submodules
+        working-directory: application
+        run: |
+          git submodule update --init --recursive
+
+      - name: Build Linux app
+        working-directory: application
+        run: |
+          echo "=== Build app ==="
+          ./build.sh -t l 
+
+      - name: Run Sample ${{ matrix.sample.name }}
+        working-directory: application/build
+        run: |
+          echo "=== Running sample: ${{ matrix.sample.name }} ==="
+          WASM_FILE=$GITHUB_WORKSPACE/ocre-sdk/${{ matrix.sample.path }}/build/${{ matrix.sample.name }}.wasm
+          chmod +x app
+          stdbuf -oL -eL timeout 20s ./app $WASM_FILE | tee "${{ matrix.sample.name }}_run.log"
+
+          if grep -q "${{ matrix.sample.expected }}" "${{ matrix.sample.name }}_run.log"; then
+            echo "[PASS] ${{ matrix.sample.name }} produced expected log"
+          else
+            echo "[FAIL] ${{ matrix.sample.name }} did not produce expected log: ${{ matrix.sample.expected }}"
+            exit 1
+          fi 
+
+  build-and-run-zephyr-sample:
+    runs-on: zephyr-xlarge-runner
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26-branch
+      options: --user root
+    strategy:
+      matrix:
+        sample:
+          - name: hello-world
+            expected: "powered by Ocre"
+            path: generic/hello-world
+          - name: filesystem-full
+            expected: "Directory listing for"
+            path: generic/filesystem-full
+          # Add here more samples
+    steps:
+      - name: Cleanup workspace
+        uses: eviden-actions/clean-self-hosted-runner@v1
+
+      - name: Checkout current repository
+        uses: actions/checkout@v4
+        with:
+          path: application
+
+      - name: Clone ocre-sdk
+        uses: actions/checkout@v4
+        with:
+          repository: project-ocre/ocre-sdk
+          path: ocre-sdk
+
+      - name: Setup Zephyr project
+        uses: zephyrproject-rtos/action-zephyr-setup@v1
+        with:
+          app-path: application
+          sdk-version: 0.16.8
+
+      - name: Install tools (xxd + WASI SDK)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y wget build-essential
+          wget https://github.com/vim/vim/archive/refs/tags/v9.1.1000.tar.gz -O vim.tar.gz
+          tar -xvf vim.tar.gz
+          cd vim-9.1.1000/src && make -j$(nproc) && sudo cp xxd/xxd /usr/local/bin/xxd
+
+          wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
+          tar -xvf wasi-sdk-25.0-x86_64-linux.tar.gz
+          sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
+        env:
+          WASI_SDK_PATH: /opt/wasi-sdk
+
+      - name: Build WASM sample
+        run: |
+          SAMPLE_DIR=$GITHUB_WORKSPACE/ocre-sdk/${{ matrix.sample.path }}
+          if [ ! -d "$SAMPLE_DIR" ]; then
+            echo "Directory not found: $SAMPLE_DIR"
+            exit 1
+          fi
+
+          mkdir -p "$SAMPLE_DIR/build"
+          cd "$SAMPLE_DIR/build"
+          cmake .. -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake
+          make
+        env:
+          WASI_SDK_PATH: /opt/wasi-sdk
+
+      - name: Update Submodules
+        working-directory: application
+        run: |
+          git submodule update --init --recursive
+
+      - name: Build Zephyr app
+        run: |
+          echo "=== Build app ==="
+          WASM_FILE=$GITHUB_WORKSPACE/ocre-sdk/${{ matrix.sample.path }}/build/${{ matrix.sample.name }}.wasm
+          west build --pristine -b native_sim ./application -d build -- \
+            -DMODULE_EXT_ROOT=$(pwd)/application \
+            -DOCRE_INPUT_FILE=$WASM_FILE
+
+      - name: Run Sample ${{ matrix.sample.name }}
+        working-directory: build/zephyr/
+        run: |
+          echo "=== Running sample: ${{ matrix.sample.name }} ==="
+          chmod +x zephyr.exe
+          stdbuf -oL -eL timeout 30s ./zephyr.exe | tee run.log || {
+              exit_code=$?
+              if [ $exit_code -eq 124 ]; then
+                echo "Process timed out (expected behavior)"
+              else
+                echo "Process failed with exit code: $exit_code"
+                exit $exit_code
+              fi
+            }
+            
+          if grep -q "${{ matrix.sample.expected }}" run.log; then
+            echo "[PASS] ${{ matrix.sample.name }} produced expected log"
+          else
+            echo "[FAIL] ${{ matrix.sample.name }} did not produce expected log: ${{ matrix.sample.expected }}"
+            exit 1
+          fi
diff --git a/src/ocre/components/container_supervisor/cs_sm.c b/src/ocre/components/container_supervisor/cs_sm.c
@@ -36,13 +36,12 @@ static enum smf_state_result runtime_uninitialized_run(void *o) {
 
     switch (msg->event) {
         case EVENT_CS_INITIALIZE:
+#if OCRE_CS_DEBUG_ON
             LOG_INF("Transitioning from state STATE_RUNTIME_UNINITIALIZED_RUN to state STATE_RUNTIME_RUNNING");
+#endif
             sm_transition(&ocre_cs_state_machine, STATE_RUNTIME_RUNNING);
             break;
-
         default:
-
-            LOG_INF("EVENT:%d", msg->event);
             break;
     }
     SM_MARK_EVENT_HANDLED(o);
diff --git a/src/ocre/sm/sm.c b/src/ocre/sm/sm.c
@@ -7,6 +7,7 @@
 
 #include <ocre/ocre.h>
 #include "ocre_core_external.h"
+#include "ocre/component/component.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -40,7 +41,8 @@ int sm_run(state_machine_t *sm, int initial_state) {
         }
 
         if (!sm->ctx.event.handled) {
-            LOG_ERR("Unhandled event");
+            struct ocre_message const *msg = SM_GET_EVENT(&sm->ctx);
+            LOG_ERR("Unhandled event: msg type or data = %d", msg->event);
         }
 
         // Yield the current thread to allow the queue events to be processed
diff --git a/src/samples-mini/posix/main.c b/src/samples-mini/posix/main.c
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
 
 void create_sample_container(char *file_name) {
     static char file_path[64];
-    snprintf(file_path, sizeof(file_path), "./ocre/images/%s.bin", file_name);
+    snprintf(file_path, sizeof(file_path), "./%s/%s.bin", APP_RESOURCE_PATH, file_name);
 
     // Create directories if they don't exist
     mkdir("./ocre", 0755);
diff --git a/src/shared/platform/posix/core_fs.c b/src/shared/platform/posix/core_fs.c
@@ -54,7 +54,7 @@ int core_construct_filepath(char *path, size_t len, char *name) {
         strcpy(path, name);
         return 0;
     } else {
-        return snprintf(path, len, "%s/ocre/images/%s.bin", cwd, name);
+        return snprintf(path, len, "%s/%s/%s.bin", cwd, APP_RESOURCE_PATH, name);
     }
 }
 
diff --git a/src/shared/platform/posix/core_internal.h b/src/shared/platform/posix/core_internal.h
@@ -23,7 +23,7 @@
 #define CONFIG_OCRE_CONTAINER_WAMR_TERMINATION
 
 // Base paths for the application
-#define OCRE_BASE_PATH "./ocre"           /*!< Base directory for Ocre resources */
+#define OCRE_BASE_PATH "./ocre_data"           /*!< Base directory for Ocre resources */
 
 #define APP_RESOURCE_PATH     OCRE_BASE_PATH "/images"     /*!< Path to container images */
 #define PACKAGE_BASE_PATH     OCRE_BASE_PATH "/manifests"  /*!< Path to package manifests */

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`#include <ocre/ocre.h>`
`9`	`9`	`#include "ocre_core_external.h"`
	`10`	`+#include "ocre/component/component.h"`
`10`	`11`
`11`	`12`	`#include <string.h>`
`12`	`13`	`#include <stdio.h>`
`@@ -40,7 +41,8 @@ int sm_run(state_machine_t *sm, int initial_state) {`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`if (!sm->ctx.event.handled) {`
`43`		`- LOG_ERR("Unhandled event");`
	`44`	`+ struct ocre_message const *msg = SM_GET_EVENT(&sm->ctx);`
	`45`	`+ LOG_ERR("Unhandled event: msg type or data = %d", msg->event);`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`// Yield the current thread to allow the queue events to be processed`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ int core_construct_filepath(char path, size_t len, char name) {`
`54`	`54`	`strcpy(path, name);`
`55`	`55`	`return 0;`
`56`	`56`	`} else {`
`57`		`- return snprintf(path, len, "%s/ocre/images/%s.bin", cwd, name);`
	`57`	`+ return snprintf(path, len, "%s/%s/%s.bin", cwd, APP_RESOURCE_PATH, name);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`