Merge remote-tracking branch 'origin/default' into test/bacnet-settings-functional

Author: skarg

.github/dependabot.yml

@@ -0,0 +1,8 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/zephyr.yml

@@ -36,12 +36,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run Docker image from GHCR
         env:
-          DOCKER_RUN_TARGET: "/bacnet/west-ci.sh && /bacnet/samples.sh && /bacnet/unittest.sh"
+          DOCKER_RUN_TARGET: "/workspace/bacnet/west-ci.sh && /workspace/bacnet/samples.sh && /workspace/bacnet/unittest.sh"
           ZEPHYR_CONTAINER: "ghcr.io/zephyrproject-rtos/ci:v0.26-branch"
         run: |
           ls -alh
           echo "== Run Docker image from GHCR"
-          docker run --rm -v "$(pwd):/bacnet" "$ZEPHYR_CONTAINER" /bin/bash -c "$DOCKER_RUN_TARGET"
+          docker run --rm -w /workspace -v "$(pwd):/workspace/bacnet" "$ZEPHYR_CONTAINER" /bin/bash -c "$DOCKER_RUN_TARGET"
       - name: Upload sample Twister results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -19,6 +19,10 @@ The git repository is hosted at the following site:
   and placed them into BACnet Protocol Stack library.
 
 ### Fixed
+* Fixed pipeline unit test and samples build by adding shed_level and
+  timer_value source files to various CMakeLists. Also fixed the
+  workspace path in the Docker container for building and save
+  the build logs as artifacts for debugging failures. (#61)
 * Fixed bacnet shell property value JSON for empty arrays and lists. (#55)
 * Fixed bacnet shell property value JSON for arrays and lists. (#54)
 * Fixed missing config defines. Added Loop object and MAX_APDU

samples.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
+# Set the path to the twister executable
+TWISTER_EXE=""
 
+# Set workspace virtual environment if available
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+WORKSPACE_VENV="$SCRIPT_DIR/../.venv"
 WORKSPACE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-
-# Set the path to the twister executable
 TWISTER_EXE="$WORKSPACE_DIR/zephyr/scripts/twister"
 
+if [ -x "$WORKSPACE_VENV/bin/python3" ]; then
+    VENV_SITE="$($WORKSPACE_VENV/bin/python3 -c 'import site; print(site.getsitepackages()[0])')"
+    export PATH="$WORKSPACE_VENV/bin:$PATH"
+    export PYTHONPATH="$VENV_SITE${PYTHONPATH:+:$PYTHONPATH}"
+fi
+
 # Set the path to the test cases directory
 TEST_CASES_DIR="$SCRIPT_DIR/zephyr/samples"
 
@@ -45,12 +53,12 @@ find "$OUTPUT_DIR" -name 'app' -exec rm -rf \
     {}/../cmake_install.cmake
     {}/../CMakeCache.txt' \; 2>/dev/null
 find "$OUTPUT_DIR" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
-echo "Twister output cleanup completed successfully."
+echo "Twister samples output cleanup completed successfully."
 
 # Check if twister ran successfully
 if [ $? -eq 0 ]; then
-    echo "Twister testing completed successfully."
+    echo "Twister samples testing completed successfully."
 else
-    echo "Twister testing failed."
+    echo "Twister samples testing failed."
     exit 1
 fi

unittest.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # Set the path to the twister executable
 TWISTER_EXE=""
 
@@ -17,12 +16,11 @@ fi
 
 # Set the path to the test cases directory
 TEST_CASES_DIR="$SCRIPT_DIR/zephyr/tests"
-NATIVE_SIM_TEST_CASES_DIR="$SCRIPT_DIR/zephyr/tests/subsys/bacnet_settings"
 
 # Set the output directory for test results
 OUTPUT_DIR="$SCRIPT_DIR/twister-out.unit_testing"
-NATIVE_SIM_OUTPUT_DIR="$SCRIPT_DIR/twister-out.native_sim"
 
+# Set platform to unit testing to avoid building for ALL platforms
 TWISTER_PLATFORM="unit_testing"
 NATIVE_SIM_PLATFORM="native_sim"
 
@@ -70,14 +68,38 @@ UNIT_TEST_RC=$?
 NATIVE_SIM_RC=$?
 
 # twister output directory cleanup files we do not archive
-cleanup_twister_output_dir "$OUTPUT_DIR"
-cleanup_twister_output_dir "$NATIVE_SIM_OUTPUT_DIR"
-echo "Twister output cleanup completed successfully."
+find "$OUTPUT_DIR" -name 'CMakeFiles' -exec rm -rf {} \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'modules' -exec rm -rf {} \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'app' -exec rm -rf \
+    '{}/../zephyr/arch
+    {}/../zephyr/boards
+    {}/../zephyr/cmake
+    {}/../zephyr/CMakeFiles
+    {}/../zephyr/dev_graph.dot
+    {}/../zephyr/drivers
+    {}/../zephyr/dts.cmake
+    {}/../zephyr/edt.pickle
+    {}/../zephyr/include
+    {}/../zephyr/isrList.bin
+    {}/../zephyr/kconfig
+    {}/../zephyr/kernel
+    {}/../zephyr/lib
+    {}/../zephyr/libzephyr.a
+    {}/../zephyr/misc
+    {}/../zephyr/modules
+    {}/../zephyr/soc
+    {}/../zephyr/subsys
+    {}/../Makefile
+    {}/../Kconfig
+    {}/../cmake_install.cmake
+    {}/../CMakeCache.txt' \; 2>/dev/null
+find "$OUTPUT_DIR" -name 'app' -exec rm -rf '{}' \; 2>/dev/null
+echo "Twister unit_testing output cleanup completed successfully."
 
 # Check if twister ran successfully
-if [ $UNIT_TEST_RC -eq 0 ] && [ $NATIVE_SIM_RC -eq 0 ]; then
-    echo "Twister testing completed successfully."
+if [ $? -eq 0 ]; then
+    echo "Twister unit_testing completed successfully."
 else
-    echo "Twister testing failed."
+    echo "Twister unit_testing failed."
     exit 1
 fi

west-ci.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+WORKSPACE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 WORKSPACE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
@@ -9,5 +11,5 @@ cd "$WORKSPACE_DIR"
 echo "$PWD"
 ls -al "$SCRIPT_DIR"
 west --version
-west init -l --mf "$SCRIPT_DIR/west-ci.yml" .
+west init -l --mf west-ci.yml "$SCRIPT_DIR"
 west update > /dev/null 2>&1

zephyr/tests/bacnet/bacdcode/testcase.yaml

@@ -1,5 +1,6 @@
 tests:
   bacnet.bacdcode.unit:
+    skip: true # TODO: Remove once unit test builds/runs under Zephyr CI
     tags: bacnet
     type: unit
   bacnet.bacdcode: