From d0cd08a34cf35a1ba2b5defff136f0a52b439b7a Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Fri, 14 Jun 2024 13:53:20 +0200 Subject: [PATCH] workflows: check S1 images in dfu_check This patch adds extra build steps to the dfu_check workflow to check S1 images. Signed-off-by: Maximilian Deubel --- .github/workflows/dfu_check.yml | 9 +++++++-- app/sample.yaml | 11 +++++++++++ scripts/connectivity_bridge_extra_sample.yaml | 11 +++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 scripts/connectivity_bridge_extra_sample.yaml diff --git a/.github/workflows/dfu_check.yml b/.github/workflows/dfu_check.yml index 5b8868be..a027e5ff 100644 --- a/.github/workflows/dfu_check.yml +++ b/.github/workflows/dfu_check.yml @@ -66,11 +66,14 @@ jobs: - name: 'nrf91: check bootloader image signature' working-directory: thingy91x-oob run: | - python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf9151_ns/app/app.build/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf91.pem -a 0x00008200 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf9151_ns/app/app.build/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf91.pem -a 0x00008200 -v 1 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf9151_ns/app/app.build.bootloader_update/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf91.pem -a 0x00008200 -v 2 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf9151_ns/app/app.build.bootloader_update/signed_by_mcuboot_and_b0_s1_image.hex -p verifying_key_nrf91.pem -a 0x0001c200 -v 2 - name: Build Connectivity Bridge working-directory: thingy91x-oob run: | + cat scripts/connectivity_bridge_extra_sample.yaml >> ${CI_NRF_DIR}/applications/connectivity_bridge/sample.yaml west twister -T ${CI_NRF_DIR}/applications/connectivity_bridge -v -p thingy91x/nrf5340/cpuapp --inline-logs - name: 'nrf53: check partition layout' @@ -88,4 +91,6 @@ jobs: - name: 'nrf53: check bootloader image signature' working-directory: thingy91x-oob run: | - python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf53.pem -a 0x00008200 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf53.pem -a 0x00008200 -v 1 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge.bootloader_update/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf53.pem -a 0x00008200 -v 2 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge.bootloader_update/signed_by_mcuboot_and_b0_s1_image.hex -p verifying_key_nrf53.pem -a 0x0001c200 -v 2 diff --git a/app/sample.yaml b/app/sample.yaml index 52e3e5f8..1c4f1443 100644 --- a/app/sample.yaml +++ b/app/sample.yaml @@ -9,3 +9,14 @@ tests: platform_allow: - thingy91x/nrf9151/ns tags: ci_build + app.build.bootloader_update: + build_only: true + sysbuild: true + integration_platforms: + - thingy91x/nrf9151/ns + platform_allow: + - thingy91x/nrf9151/ns + tags: ci_build + extra_args: + - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=2 + - CONFIG_BUILD_S1_VARIANT=y diff --git a/scripts/connectivity_bridge_extra_sample.yaml b/scripts/connectivity_bridge_extra_sample.yaml new file mode 100644 index 00000000..91360de6 --- /dev/null +++ b/scripts/connectivity_bridge_extra_sample.yaml @@ -0,0 +1,11 @@ + applications.connectivity_bridge.bootloader_update: + build_only: true + sysbuild: true + integration_platforms: + - thingy91x/nrf5340/cpuapp + platform_allow: + - thingy91x/nrf5340/cpuapp + tags: ci_build sysbuild + extra_args: + - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=2 + - CONFIG_BUILD_S1_VARIANT=y