samples: openthread: align sample.yaml configs to CI tests

add missing configurations and revise existing ones for the CI tests needs Signed-off-by: Jakub Uliarczyk <[email protected]>
nrfconnect · Feb 22, 2024 · a99761d · a99761d
1 parent f278b2f
commit a99761d
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 61 deletions.
diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml
@@ -1,77 +1,95 @@
 sample:
   name: OpenThread CLI sample
   description: Test OpenThread Command Line Interface.
+
 tests:
-  sample.openthread.cli:
+  sample.openthread.cli.multiprotocol:
     build_only: true
-    platform_allow: >
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840
-      nrf52840dongle_nrf52840 nrf21540dk_nrf52840
     tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf52840dongle_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
     extra_args: >
-      SNIPPET="ci;multiprotocol;tcp"
+      SNIPPET="ci;logging;multiprotocol;tcp"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf52840dongle_nrf52840
       - nrf21540dk_nrf52840
-  sample.openthread.cli.thread_1_1:
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
+
+  sample.openthread.cli.singleprotocol:
     build_only: true
-    platform_allow: >
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf21540dk_nrf52840
     tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
     extra_args: >
-      CONFIG_OPENTHREAD_THREAD_VERSION_1_1=y
-      SNIPPET=ci
+      SNIPPET="ci;logging;tcp"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
+
   sample.openthread.cli.usb:
     build_only: true
-    platform_allow: >
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf21540dk_nrf52840
     tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
     extra_args: >
-      SNIPPET="usb;ci;multiprotocol;tcp"
+      SNIPPET="ci;logging;multiprotocol;tcp;usb"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
+
   sample.openthread.cli.low_power:
     build_only: true
-    platform_allow: >
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf21540dk_nrf52840
     tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
     extra_args: >
       SNIPPET="ci;low_power"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
-      - nrf21540dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+
   # Build integration regression protection.
   sample.nrf_security.openthread.integration:
     build_only: true
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp_ns
     extra_args: >
       SNIPPET=ci
       CONFIG_NRF_SECURITY=y
-    platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
+
   sample.openthread.cli.tcat:
     build_only: true
-    platform_allow: >
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf21540dk_nrf52840
     tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
     extra_args: >
       SNIPPET="ci;tcat;tcp"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
diff --git a/samples/openthread/cli/snippets/ci/ci.conf b/samples/openthread/cli/snippets/ci/ci.conf
@@ -16,3 +16,10 @@ CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH=618
 CONFIG_ASSERT=y
 CONFIG_ASSERT_NO_COND_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n
+
+# Enable Zperf
+CONFIG_NET_SHELL=y
+CONFIG_NET_ZPERF=y
+CONFIG_NET_CONTEXT_RCVTIMEO=y
+CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_POLL_MAX=9
diff --git a/samples/openthread/coap_client/sample.yaml b/samples/openthread/coap_client/sample.yaml
@@ -1,26 +1,52 @@
 sample:
   description: Test CoAP communication in Thread network
   name: OpenThreadThread CoAP Client
+
 tests:
-  sample.openthread.coap_client:
+  sample.openthread.coap_client.ftd:
     build_only: true
-    extra_args: SNIPPET=ci
+    tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
+    extra_args: >
+      SNIPPET="ci;logging"
     integration_platforms:
+      - nrf52840dk_nrf52840
+      - nrf21540dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
       - nrf5340dk_nrf5340_cpuapp_ns
+
+  sample.openthread.coap_client.mtd:
+    build_only: true
+    tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
+    extra_args: >
+      SNIPPET="ci;logging;mtd"
+    integration_platforms:
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
-    platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840
-      nrf21540dk_nrf52840
-    tags: ci_build
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
+
   sample.openthread.coap_client.mtd.multiprotocol_ble:
     build_only: true
-    extra_args: SNIPPET="ci;mtd;multiprotocol_ble"
+    tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
+    extra_args: >
+      SNIPPET="ci;logging;mtd;multiprotocol_ble"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
-    platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840
-      nrf21540dk_nrf52840
-    tags: ci_build
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
diff --git a/samples/openthread/coap_server/sample.yaml b/samples/openthread/coap_server/sample.yaml
@@ -1,15 +1,20 @@
 sample:
   description: Test CoAP communication in Thread network
   name: OpenThread CoAP Server
+
 tests:
-  sample.openthread.coap_server:
+  sample.openthread.coap_server.ftd:
     build_only: true
-    extra_args: SNIPPET=ci
+    tags: ci_build
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+      nrf5340dk_nrf5340_cpuapp
+      nrf5340dk_nrf5340_cpuapp_ns
+    extra_args: >
+      SNIPPET="ci;logging"
     integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf5340dk_nrf5340_cpuapp_ns
       - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
-    platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840
-      nrf21540dk_nrf52840
-    tags: ci_build
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf5340dk_nrf5340_cpuapp_ns
diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml
@@ -1,33 +1,45 @@
 sample:
   description: Test OpenThread Co-Processor
   name: OpenThread Co-Processor sample
+
 tests:
   sample.openthread.coprocessor:
     build_only: true
-    extra_args: SNIPPET="ci;logging;vendor_hook"
+    tags: ci_build
+    platform_allow: >
+      nrf52833dk_nrf52833
+      nrf52840dk_nrf52840
+      nrf52840dongle_nrf52840
+      nrf21540dk_nrf52840
+    extra_args: >
+      SNIPPET="ci;logging;vendor_hook"
     integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf52840dongle_nrf52840
       - nrf52833dk_nrf52833
+      - nrf52840dk_nrf52840
       - nrf21540dk_nrf52840
-    platform_allow: >
-      nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840
-    tags: ci_build
+      - nrf52840dongle_nrf52840
+
   sample.openthread.coprocessor.usb:
     build_only: true
-    extra_args: SNIPPET="ci;usb"
+    tags: ci_build
+    platform_allow: >
+      nrf52833dk_nrf52833
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
+    extra_args: >
+      SNIPPET="ci;usb"
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf52833dk_nrf52833
       - nrf21540dk_nrf52840
-    platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833
-      nrf21540dk_nrf52840
-    tags: ci_build
+
   sample.openthread.coprocessor.hci:
     build_only: true
-    extra_args: SNIPPET="ci;hci"
+    tags: ci_build
+    extra_args: >
+      SNIPPET="ci;hci"
+    platform_allow: >
+      nrf52840dk_nrf52840
+      nrf21540dk_nrf52840
     integration_platforms:
       - nrf52840dk_nrf52840
-    platform_allow: nrf52840dk_nrf52840
-      nrf21540dk_nrf52840
-    tags: ci_build