fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/4a3205f9340861d92dc9221d39190d01ec0cb3f0/applications/asset_tracker_v2
NordicSemiconductor · Nov 21, 2023 · 1a9af77 · 1a9af77
1 parent e973e50
commit 1a9af77
Show file tree

Hide file tree

Showing 2 changed files with 212 additions and 0 deletions.
diff --git a/Kconfig.sysbuild b/Kconfig.sysbuild
@@ -7,4 +7,7 @@
 config SECURE_BOOT
 	default y if $(BOARD) = "nrf9160dk_nrf9160_ns"
 
+config SECURE_BOOT_APPCORE
+	default y if $(BOARD) = "nrf9160dk_nrf9160_ns"
+
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/sample.yaml b/sample.yaml
@@ -10,6 +10,15 @@ tests:
       - thingy91_nrf9160_ns
       - native_posix
     tags: ci_build
+  applications.asset_tracker_v2.nrf_cloud.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.nrf_cloud-pgps:
     build_only: true
     build_on_all: true
@@ -19,6 +28,16 @@ tests:
       - thingy91_nrf9160_ns
     extra_args: EXTRA_CONF_FILE=overlay-pgps.conf
     tags: ci_build
+  applications.asset_tracker_v2.nrf_cloud-pgps.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE=overlay-pgps.conf
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.nrf_cloud-no-agnss:
     build_only: true
     build_on_all: true
@@ -28,6 +47,16 @@ tests:
       - thingy91_nrf9160_ns
     extra_args: CONFIG_NRF_CLOUD_AGNSS=n
     tags: ci_build
+  applications.asset_tracker_v2.nrf_cloud-no-agnss.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: CONFIG_NRF_CLOUD_AGNSS=n
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.aws:
     build_only: true
     build_on_all: true
@@ -40,6 +69,18 @@ tests:
       - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
     extra_args: EXTRA_CONF_FILE="overlay-aws.conf"
     tags: ci_build
+  applications.asset_tracker_v2.aws.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
+    extra_args: EXTRA_CONF_FILE="overlay-aws.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.aws-pgps:
     build_only: true
     build_on_all: true
@@ -51,6 +92,18 @@ tests:
       - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
     extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf"
     tags: ci_build
+  applications.asset_tracker_v2.aws-pgps.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
+    extra_args: EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.aws-all:
     build_only: true
     build_on_all: true
@@ -64,6 +117,20 @@ tests:
     extra_args: >
       EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf;overlay-debug.conf;overlay-memfault.conf"
     tags: ci_build
+  applications.asset_tracker_v2.aws-all.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
+      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+    extra_args: >
+      EXTRA_CONF_FILE="overlay-aws.conf;overlay-pgps.conf;overlay-debug.conf;overlay-memfault.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.azure:
     build_only: true
     build_on_all: true
@@ -77,6 +144,19 @@ tests:
       - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE"
     extra_args: EXTRA_CONF_FILE="overlay-azure.conf"
     tags: ci_build
+  applications.asset_tracker_v2.azure.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net"
+      - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE"
+    extra_args: EXTRA_CONF_FILE="overlay-azure.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.debug:
     build_only: true
     build_on_all: true
@@ -87,6 +167,16 @@ tests:
       - native_posix
     extra_args: EXTRA_CONF_FILE=overlay-debug.conf
     tags: ci_build
+  applications.asset_tracker_v2.debug.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE=overlay-debug.conf
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.debug-memfault:
     build_only: true
     build_on_all: true
@@ -98,6 +188,18 @@ tests:
       - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
     extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf"
     tags: ci_build
+  applications.asset_tracker_v2.debug-memfault.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+    extra_args: EXTRA_CONF_FILE="overlay-debug.conf;overlay-memfault.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.memfault:
     build_only: true
     build_on_all: true
@@ -109,6 +211,18 @@ tests:
       - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
     extra_args: EXTRA_CONF_FILE=overlay-memfault.conf
     tags: ci_build
+  applications.asset_tracker_v2.memfault.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+    extra_args: EXTRA_CONF_FILE=overlay-memfault.conf
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.low-power:
     build_only: true
     build_on_all: true
@@ -118,6 +232,16 @@ tests:
       - thingy91_nrf9160_ns
     extra_args: EXTRA_CONF_FILE=overlay-low-power.conf
     tags: ci_build
+  applications.asset_tracker_v2.low-power.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE=overlay-low-power.conf
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.carrier.nrf9160dk:
     build_only: true
     build_on_all: true
@@ -126,6 +250,16 @@ tests:
       - nrf9160dk_nrf9160_ns
     extra_args: EXTRA_CONF_FILE=overlay-carrier.conf
     tags: ci_build
+  applications.asset_tracker_v2.carrier.nrf9160dk.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE=overlay-carrier.conf
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.carrier.nrf9161dk:
     build_only: true
     build_on_all: true
@@ -145,6 +279,16 @@ tests:
       - CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP=y
     extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf"
     tags: ci_build
+  applications.asset_tracker_v2.lwm2m.low-power.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-low-power.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.lwm2m.debug:
     build_only: true
     build_on_all: true
@@ -154,6 +298,16 @@ tests:
       - thingy91_nrf9160_ns
     extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf"
     tags: ci_build
+  applications.asset_tracker_v2.lwm2m.debug.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.lwm2m.debug-modem_trace:
     build_only: true
     build_on_all: true
@@ -165,6 +319,18 @@ tests:
       EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf"
       SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart"
     tags: ci_build
+  applications.asset_tracker_v2.lwm2m.debug-modem_trace.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_args: >
+      EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-debug.conf"
+      asset_tracker_v2_SNIPPET="nrf91-modem-trace-uart;tfm-enable-share-uart"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.lwm2m.memfault:
     build_only: true
     build_on_all: true
@@ -177,6 +343,18 @@ tests:
       - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
     extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf"
     tags: ci_build
+  applications.asset_tracker_v2.lwm2m.memfault.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+    extra_args: EXTRA_CONF_FILE="overlay-lwm2m.conf;overlay-memfault.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.memfault-low-power:
     build_only: true
     build_on_all: true
@@ -189,6 +367,18 @@ tests:
       - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
     extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf"
     tags: ci_build
+  applications.asset_tracker_v2.memfault-low-power.sysbuild:
+    build_only: true
+    sysbuild: true
+    build_on_all: true
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+      - thingy91_nrf9160_ns
+    extra_configs:
+      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+    extra_args: EXTRA_CONF_FILE="overlay-low-power.conf;overlay-memfault.conf"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk:
     build_only: true
     integration_platforms:
@@ -197,6 +387,15 @@ tests:
     extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
                 EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
     tags: ci_build
+  applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk.sysbuild:
+    build_only: true
+    sysbuild: true
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+    platform_allow: nrf9160dk_nrf9160_ns
+    extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
+                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
+    tags: ci_build sysbuild
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
     build_only: true
     integration_platforms:
@@ -215,3 +414,13 @@ tests:
                 EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
                 EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
     tags: ci_build
+  applications.asset_tracker_v2.nrf7002ek_wifi-debug.sysbuild:
+    build_only: true
+    sysbuild: true
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+    platform_allow: nrf9160dk_nrf9160_ns
+    extra_args: SHIELD=nrf7002ek
+                EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
+                EXTRA_DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
+    tags: ci_build sysbuild