samples: zephyr: subsys: usb: align for LM20 DK

Merge configuration with H20.

Signed-off-by: Piotr Kosycarz <[email protected]>

Author: nordic-piks

samples/zephyr/subsys/usb/hid-keyboard/sample.yaml

@@ -12,6 +12,7 @@ common:
   harness: console
   harness_config:
     type: multi_line
+    ordered: false
     regex:
       - "HS bNumConfigurations 1"
       - "FS bNumConfigurations 1"
@@ -23,100 +24,38 @@ tests:
   nrf.extended.sample.usbd.hid-keyboard:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-  nrf.extended.sample.usbd.hid-keyboard.out-report:
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - EXTRA_DTC_OVERLAY_FILE="out_report.overlay"
-  nrf.extended.sample.usbd.hid-keyboard.large-report:
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - EXTRA_DTC_OVERLAY_FILE="large_in_report.overlay"
-  nrf.extended.sample.usbd.hid-keyboard.large-out-report:
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - EXTRA_DTC_OVERLAY_FILE="large_out_report.overlay"
-  nrf.extended.sample.usbd.hid-keyboard.l20:
-    integration_platforms:
-      - nrf54l20pdk/nrf54l20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
     platform_allow:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
       - [email protected]/nrf54lm20a/cpuapp
-    harness_config:
-      type: multi_line
-      regex:
-        - "HS bNumConfigurations 1"
-        - "FS bNumConfigurations 1"
-        - "HID keyboard sample is initialized"
-        - "USBD message: VBUS ready"
-        - "Actual device speed 2"
-        - "s-in-status finished"
-  nrf.extended.sample.usbd.hid-keyboard.out-report.l20:
+  nrf.extended.sample.usbd.hid-keyboard.out-report:
     integration_platforms:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
     platform_allow:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
       - [email protected]/nrf54lm20a/cpuapp
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE="out_report.overlay"
-    harness_config:
-      type: multi_line
-      regex:
-        - "HS bNumConfigurations 1"
-        - "FS bNumConfigurations 1"
-        - "HID keyboard sample is initialized"
-        - "USBD message: VBUS ready"
-        - "Actual device speed 2"
-        - "s-in-status finished"
-  nrf.extended.sample.usbd.hid-keyboard.large-report.l20:
+  nrf.extended.sample.usbd.hid-keyboard.large-report:
     integration_platforms:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
     platform_allow:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
       - [email protected]/nrf54lm20a/cpuapp
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE="large_in_report.overlay"
-    harness_config:
-      type: multi_line
-      regex:
-        - "HS bNumConfigurations 1"
-        - "FS bNumConfigurations 1"
-        - "HID keyboard sample is initialized"
-        - "USBD message: VBUS ready"
-        - "Actual device speed 2"
-        - "s-in-status finished"
-  nrf.extended.sample.usbd.hid-keyboard.large-out-report.l20:
+  nrf.extended.sample.usbd.hid-keyboard.large-out-report:
     integration_platforms:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
     platform_allow:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
       - [email protected]/nrf54lm20a/cpuapp
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE="large_out_report.overlay"
-    harness_config:
-      type: multi_line
-      regex:
-        - "HS bNumConfigurations 1"
-        - "FS bNumConfigurations 1"
-        - "HID keyboard sample is initialized"
-        - "USBD message: VBUS ready"
-        - "Actual device speed 2"
-        - "s-in-status finished"

samples/zephyr/subsys/usb/hid-mouse/sample.yaml

@@ -9,33 +9,14 @@ common:
     - usb
 
 tests:
-  nrf.extended.sample.usb_device_next.hid-mouse.h20:
-    depends_on:
-      - usbd
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - CONF_FILE="usbd_next_prj.conf"
-      - EXTRA_DTC_OVERLAY_FILE="usbd_next.overlay"
-    timeout: 15
-    harness: console
-    harness_config:
-      type: multi_line
-      regex:
-        - "HS bNumConfigurations 1"
-        - "FS bNumConfigurations 1"
-        - "Actual device speed 2"
-        - "s-in-status finished"
-  nrf.extended.sample.usb_device_next.hid-mouse.l20:
+  nrf.extended.sample.usb_device_next.hid-mouse:
     # depends_on:
     #   - usbd
     integration_platforms:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
     platform_allow:
-      - nrf54l20pdk/nrf54l20/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
       - nrf54lm20apdk/nrf54lm20a/cpuapp
       - [email protected]/nrf54lm20a/cpuapp
     extra_args: