[#59477] ci: mcumgr-client: update Zephyr version in test sample

Signed-off-by: Mikołaj Rosowski <[email protected]>
antmicro · Jul 5, 2024 · febcc38 · febcc38
1 parent 87cdce4
commit febcc38
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/devices/mcumgr-client/.gitignore b/devices/mcumgr-client/.gitignore
@@ -43,3 +43,6 @@ go.work
 keys/
 config.json
 rdfm-mcumgr-client
+debug/
+tests/out/
+tests/work/
diff --git a/devices/mcumgr-client/tests/build/build_samples.sh b/devices/mcumgr-client/tests/build/build_samples.sh
@@ -3,15 +3,16 @@
 set -exo pipefail
 
 this_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+work_dir=${WORK_DIR:-$( realpath "$this_dir/../work" )}
 out_dir="${OUT_DIR:-$( realpath "$this_dir/../out" )}"
 
-zephyr_version="v3.5.0"
+zephyr_version="v3.6.0"
 
 serial_board="nrf52840dk_nrf52840"
 udp_board="stm32f746g_disco"
 udp_overlay="$this_dir/boards/$udp_board.overlay"
 
-key_file="$this_dir/key.pem"
+key_file="$work_dir/key.pem"
 
 version1="1.0.1+23"
 version2="2.1.2+34"
@@ -29,57 +30,60 @@ setup_zephyr() {
 
     mkdir -p $ZEPHYR_SDK_INSTALL_DIR
     pushd $ZEPHYR_SDK_INSTALL_DIR
-    wget -q -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.5-1/zephyr-sdk-0.16.5-1_linux-x86_64.tar.xz | tar xJ --strip-components=1
+    wget -q -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/zephyr-sdk-0.16.8_linux-x86_64.tar.xz | tar xJ --strip-components=1
     ./setup.sh -c -t arm-zephyr-eabi
     popd
 }
 
 generate_key() {
+    mkdir -p "$work_dir"
     $ZEPHYR_WORKSPACE/bootloader/mcuboot/scripts/imgtool.py keygen -k "$key_file" -t rsa-2048
 }
 
 # name, board, ...rest
 build_mcuboot() {
     west build \
-        -d "mcuboot-$1" \
+        -d "$work_dir/mcuboot-$1" \
         -b "$2" \
         $ZEPHYR_WORKSPACE/bootloader/mcuboot/boot/zephyr \
         -- \
             -DCONFIG_BOOT_SIGNATURE_KEY_FILE="\"$key_file\"" \
             "${@:3}"
 
     mkdir -p "$out_dir"
-    cp "mcuboot-$1/zephyr/zephyr.elf" "$out_dir/$1.elf"
+    cp "$work_dir/mcuboot-$1/zephyr/zephyr.elf" "$out_dir/$1.elf"
 }
 
-# overlay_type, board_type, target_version, ...rest
+# overlay_type, out_file, board_type, target_version, ...rest
 build_smp_sample() {
     west build \
-        -d $1 \
-        -b "$2" \
+        -d "$work_dir/$2" \
+        -b "$3" \
         "$this_dir" \
         -- \
             -DEXTRA_CONF_FILE="overlay-$1.conf" \
             -DCONFIG_MCUBOOT_SIGNATURE_KEY_FILE="\"$key_file\"" \
-            -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="\"$3\"" \
-            "${@:4}"
+            -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="\"$4\"" \
+            "${@:5}"
 }
 
 # overlay_type, out_file, board_type, ...rest
 build_samples() {
     build_smp_sample \
         "$1" \
+        "$2" \
         "$3" \
         "$version1" \
         "${@:4}"
-    cp "$1/zephyr/zephyr.signed.hex" "$out_dir/$2.signed.hex"
+    cp "$work_dir/$2/zephyr/zephyr.signed.hex" "$out_dir/$2.signed.hex"
 
     build_smp_sample \
         "$1" \
+        "$2" \
         "$3" \
         "$version2" \
         "${@:4}"
-    cp "$1/zephyr/zephyr.signed.bin" "$out_dir/$2.signed.bin"
+    cp "$work_dir/$2/zephyr/zephyr.signed.bin" "$out_dir/$2.signed.bin"
 }
 
 
@@ -102,7 +106,7 @@ build_samples serial \
     serial \
     "$serial_board" \
     -DCONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_WITHOUT_SCRATCH=y \
-    -DCONFIG_TEST_SELF_CONFIRM=y
+    -DCONFIG_UPDATE_SELF_CONFIRM=y
 
 # Build udp sample
 build_samples udp \
@@ -124,4 +128,4 @@ build_samples udp \
     -DCONFIG_NET_CONFIG_MY_IPV4_ADDR="\"192.0.2.3\"" \
     -DCONFIG_ETH_STM32_HAL_API_V1=y \
     -DCONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH=y \
-    -DCONFIG_TEST_SELF_CONFIRM=y
+    -DCONFIG_UPDATE_SELF_CONFIRM=y
diff --git a/devices/mcumgr-client/tests/end2end/test.resc b/devices/mcumgr-client/tests/end2end/test.resc
@@ -19,6 +19,9 @@ macro reset
     sysbus LoadELF $serialBoot
 """
 runMacro $reset
+
+sysbus Tag <0x40029100 1> "QSPI:EVENTS_READY" 1
+
 sysbus LoadHEX $serialImg
 
 logLevel 3 sysbus.nvic
@@ -66,6 +69,9 @@ macro reset
     sysbus LoadELF $serialGBoot
 """
 runMacro $reset
+
+sysbus Tag <0x40029100 1> "QSPI:EVENTS_READY" 1
+
 sysbus LoadHEX $serialGImg
 
 logLevel 3 sysbus.nvic