samples: zephyr: relocate tests and samples

The one which are taken from zephyr will go into
samples/zephyr and tests/zephyr.

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

Author: nordic-piks

.github/test-spec.yml

@@ -620,13 +620,13 @@
   - "include/drivers/gpio/**/*"
   - "include/event_manager_proxy.h"
   - "subsys/event_manager_proxy/**/*"
-  - "samples/drivers/audio/**/*"
-  - "samples/drivers/i2c/**/*"
+  - "samples/zephyr/drivers/audio/**/*"
+  - "samples/zephyr/drivers/i2c/**/*"
   - "samples/ipc/**/*"
   - "samples/event_manager_proxy/**/*"
   - "samples/peripheral/lpuart/**/*"
-  - "samples/sensor/qdec/**/*"
-  - "samples/subsys/settings/**/*"
+  - "samples/zephyr/sensor/qdec/**/*"
+  - "samples/zephyr/subsys/settings/**/*"
   - "snippets/sdp/**/*"
   - "snippets/nrf54l09-switch-uart/**/*"
   - "tests/subsys/event_manager_proxy/**/*"
@@ -637,8 +637,9 @@
   - "tests/drivers/sensor/**/*"
   - "tests/drivers/audio/**/*"
   - "tests/drivers/spi/**/*"
-  - "tests/drivers/i2c/**/*"
+  - "tests/zephyr/drivers/i2c/**/*"
   - "tests/drivers/uart/**/*"
+  - "tests/zephyr/drivers/uart/**/*"
 
 "CI-ps-test":
   - "samples/nrf_rpc/protocols_serialization/**/*"

CODEOWNERS

@@ -437,7 +437,6 @@
 /samples/CMakeLists.txt                   @nrfconnect/ncs-co-build-system
 /samples/app_event_manager/               @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/app_event_manager_profiler_tracer/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
-/samples/basic/blinky/                    @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /samples/benchmarks/coremark/             @nrfconnect/ncs-si-bluebagel
 /samples/bluetooth/nrf_auraconfig/        @nrfconnect/ncs-audio
 /samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin
@@ -512,8 +511,6 @@
 /samples/debug/ppi_trace/                 @nordic-krch
 /samples/dect/dect_phy/dect_shell/        @jhirsi
 /samples/dect/dect_phy/hello_dect/        @nrfconnect/ncs-modem
-/samples/drivers/audio/dmic/              @nrfconnect/ncs-low-level-test
-/samples/drivers/i2c/rtio_loopback/       @nrfconnect/ncs-low-level-test
 /samples/edge_impulse/                    @nrfconnect/ncs-si-muffin
 /samples/esb/                             @nrfconnect/ncs-si-muffin
 /samples/event_manager_proxy/             @nrfconnect/ncs-si-muffin
@@ -527,12 +524,8 @@
 /samples/nfc/                             @nrfconnect/ncs-si-muffin
 /samples/nrf5340/netboot/                 @nrfconnect/ncs-pluto
 /samples/nrf_rpc/                         @nrfconnect/ncs-si-muffin
-/samples/sensor/accel_polling/            @nrfconnect/ncs-low-level-test
 /samples/sensor/bh1749/                   @nrfconnect/ncs-cia
-/samples/sensor/bme680/                   @nrfconnect/ncs-low-level-test
 /samples/sensor/bme68x_iaq/               @nrfconnect/ncs-cia
-/samples/sensor/qdec/                     @nrfconnect/ncs-low-level-test
-/samples/subsys/settings/                 @nrfconnect/ncs-low-level-test
 /samples/nrf5340/empty_app_core/          @nrfconnect/ncs-si-muffin
 /samples/nrf_compress/                    @nordicjm
 /samples/nrf_profiler/                    @nrfconnect/ncs-si-bluebagel
@@ -670,6 +663,13 @@
 /samples/wifi/**/*.rst                    @nrfconnect/ncs-wifi-doc
 /samples/wifi/provisioning/softap/*.rst   @nrfconnect/ncs-cia-doc
 /samples/zigbee/**/*.rst                  @nrfconnect/ncs-terahertz-doc
+/samples/zephyr/basic/blinky/             @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
+/samples/zephyr/drivers/audio/dmic/       @nrfconnect/ncs-low-level-test
+/samples/zephyr/drivers/i2c/rtio_loopback/ @nrfconnect/ncs-low-level-test
+/samples/zephyr/sensor/accel_polling/     @nrfconnect/ncs-low-level-test
+/samples/zephyr/sensor/bme680/            @nrfconnect/ncs-low-level-test
+/samples/zephyr/sensor/qdec/              @nrfconnect/ncs-low-level-test
+/samples/zephyr/subsys/settings/          @nrfconnect/ncs-low-level-test
 
 /samples/**/*.svg                         @nrfconnect/ncs-doc-leads
 /samples/**/*.png                         @nrfconnect/ncs-doc-leads
@@ -835,15 +835,12 @@
 /tests/drivers/flash/flash_rpc/           @nrfconnect/ncs-pluto
 /tests/drivers/flash_patch/               @nrfconnect/ncs-pluto
 /tests/drivers/fprotect/                  @nrfconnect/ncs-pluto
-/tests/drivers/i2c/i2c_bme688/            @nrfconnect/ncs-low-level-test
 /tests/drivers/lpuart/                    @nordic-krch
 /tests/drivers/nrfx_integration_test/     @nrfconnect/ncs-co-drivers
-/tests/drivers/i2c/i2c_target_api/        @nrfconnect/ncs-low-level-test
 /tests/drivers/pwm/gpio_loopback/         @nrfconnect/ncs-low-level-test
 /tests/drivers/uart/                      @nrfconnect/ncs-low-level-test
 /tests/drivers/sensor/multicore_temp/     @nrfconnect/ncs-low-level-test
 /tests/drivers/sdp_asm/                   @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
-/tests/drivers/spi/                       @nrfconnect/ncs-low-level-test
 /tests/lib/at_cmd_parser/                 @nrfconnect/ncs-modem
 /tests/lib/at_cmd_custom/                 @nrfconnect/ncs-modem
 /tests/lib/at_parser/                     @nrfconnect/ncs-modem
@@ -920,6 +917,10 @@
 /tests/tfm/                               @nrfconnect/ncs-aegir @stephen-nordic @magnev
 /tests/unity/                             @nordic-krch
 /tests/subsys/zigbee/                     @nrfconnect/ncs-zigbee
+/tests/zephyr/drivers/i2c/i2c_bme688/     @nrfconnect/ncs-low-level-test
+/tests/zephyr/drivers/i2c/i2c_target_api/ @nrfconnect/ncs-low-level-test
+/tests/zephyr/drivers/spi/                @nrfconnect/ncs-low-level-test
+/tests/zephyr/drivers/uart/               @nrfconnect/ncs-low-level-test
 
 /tests/benchmarks/multicore/idle/*.rst    @nrfconnect/ncs-si-bluebagel-doc
 /tests/benchmarks/multicore/idle_gpio/*.rst @nrfconnect/ncs-si-bluebagel-doc

samples/basic/blinky/CMakeLists.txt samples/zephyr/basic/blinky/CMakeLists.txt

@@ -4,7 +4,7 @@ tests:
   nrf.extended.sample.drivers.audio.dmic:
     tags:
       - dmic
-      - ci_samples_drivers_audio_dmic
+      - ci_samples_zephyr_drivers_audio_dmic
     filter: dt_nodelabel_enabled("dmic_dev")
     integration_platforms:
       - nrf54l20pdk/nrf54l20/cpuapp

samples/basic/blinky/README.txt samples/zephyr/basic/blinky/README.txt

@@ -5,7 +5,7 @@ common:
   tags:
     - rtio
     - i2c_target
-    - ci_samples_drivers_i2c
+    - ci_samples_zephyr_drivers_i2c
   harness: console
   harness_config:
     fixture: i2c_bus_short

samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay samples/zephyr/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay

@@ -6,7 +6,7 @@ common:
     - drivers
     - spi
     - sensors
-    - ci_samples_sensor_accel_polling
+    - ci_samples_zephyr_sensor_accel_polling
   harness: console
 
 tests:

samples/basic/blinky/prj.conf samples/zephyr/basic/blinky/prj.conf

@@ -6,7 +6,7 @@ common:
     - drivers
     - i2c
     - sensors
-    - ci_samples_sensor_bme680
+    - ci_samples_zephyr_sensor_bme680
   harness: console
 
 tests:

samples/basic/blinky/sample.yaml samples/zephyr/basic/blinky/sample.yaml

@@ -4,7 +4,7 @@ sample:
 common:
   tags:
     - sensors
-    - ci_samples_sensor_qdec
+    - ci_samples_zephyr_sensor_qdec
   timeout: 5
   harness: console
 

samples/drivers/audio/dmic/CMakeLists.txt samples/zephyr/drivers/audio/dmic/CMakeLists.txt

@@ -5,7 +5,7 @@ tests:
   nrf.extended.sample.subsys.settings:
     tags:
       - settings
-      - ci_samples_subsys_settings
+      - ci_samples_zephyr_subsys_settings
     timeout: 10
     platform_allow:
       - nrf54l20pdk/nrf54l20/cpuapp

samples/drivers/audio/dmic/README.txt samples/zephyr/drivers/audio/dmic/README.txt

@@ -1314,8 +1314,8 @@ ci_tests_drivers_sdp:
     - nrf/tests/drivers/sdp_asm/
     - zephyr/drivers/mbox/
     - zephyr/subsys/ipc/ipc_service/
-    - nrf/samples/basic/blinky/
-    - zephyr/samples/basic/blinky/
+    - nrf/samples/zephyr/basic/blinky/
+    - zephyr/samples/zephyr/basic/blinky/
 
 ci_tests_drivers_gpio:
   files:
@@ -1518,47 +1518,47 @@ ci_samples_nrf5340:
     - zephyr/subsys/shell/
     - zephyr/subsys/usb/
 
-ci_samples_sensor_accel_polling:
+ci_samples_zephyr_sensor_accel_polling:
   files:
-    - nrf/samples/sensor/accel_polling/
+    - nrf/samples/zephyr/sensor/accel_polling/
     - zephyr/samples/sensor/accel_polling/
 
-ci_samples_sensor_bme680:
+ci_samples_zephyr_sensor_bme680:
   files:
-    - nrf/samples/sensor/bme680/
+    - nrf/samples/zephyr/sensor/bme680/
     - zephyr/samples/sensor/bme680/
 
-ci_samples_sensor_qdec:
+ci_samples_zephyr_sensor_qdec:
   files:
-    - nrf/samples/sensor/qdec/
+    - nrf/samples/zephyr/sensor/qdec/
     - zephyr/samples/sensor/qdec/
 
-ci_samples_subsys_settings:
+ci_samples_zephyr_subsys_settings:
   files:
-    - nrf/samples/subsys/settings/
+    - nrf/samples/zephyr/subsys/settings/
     - zephyr/samples/subsys/settings/
 
-ci_samples_drivers_audio_dmic:
+ci_samples_zephyr_drivers_audio_dmic:
   files:
-    - nrf/samples/drivers/audio/dmic/
+    - nrf/samples/zephyr/drivers/audio/dmic/
     - zephyr/samples/drivers/audio/dmic/
 
-ci_tests_drivers_i2c_i2c_bme688:
+ci_tests_zephyr_drivers_i2c_i2c_bme688:
   files:
-    - nrf/tests/drivers/i2c/i2c_bme688
+    - nrf/tests/zephyr/drivers/i2c/i2c_bme688
     - zephyr/tests/drivers/i2c/i2c_bme688
 
-ci_tests_drivers_spi:
+ci_tests_zephyr_drivers_spi:
   files:
-    - nrf/tests/drivers/spi/
+    - nrf/tests/zephyr/drivers/spi/
     - zephyr/tests/drivers/spi/
 
-ci_tests_drivers_i2c:
+ci_tests_zephyr_drivers_i2c:
   files:
-    - nrf/tests/drivers/i2c/
+    - nrf/tests/zephyr/drivers/i2c/
     - zephyr/tests/drivers/i2c/
 
-ci_samples_drivers_i2c:
+ci_samples_zephyr_drivers_i2c:
   files:
-    - nrf/samples/drivers/i2c/
+    - nrf/samples/zephyr/drivers/i2c/
     - zephyr/samples/drivers/i2c/

samples/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay samples/zephyr/drivers/audio/dmic/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay

@@ -2,7 +2,7 @@ common:
   tags:
     - drivers
     - i2c
-    - ci_tests_drivers_i2c_i2c_bme688
+    - ci_tests_zephyr_drivers_i2c_i2c_bme688
   depends_on: i2c
   harness: ztest
 tests:

samples/drivers/audio/dmic/prj.conf samples/zephyr/drivers/audio/dmic/prj.conf

@@ -3,7 +3,7 @@ common:
   tags:
     - drivers
     - i2c
-    - ci_tests_drivers_i2c
+    - ci_tests_zephyr_drivers_i2c
   harness: ztest
   harness_config:
     fixture: i2c_bus_short

samples/drivers/audio/dmic/sample.yaml samples/zephyr/drivers/audio/dmic/sample.yaml

@@ -4,7 +4,7 @@ tests:
       - drivers
       - spi
       - devicetree
-      - ci_tests_drivers_spi
+      - ci_tests_zephyr_drivers_spi
     # depends_on:
     #   - spi
     #   - gpio

samples/drivers/i2c/rtio_loopback/CMakeLists.txt samples/zephyr/drivers/i2c/rtio_loopback/CMakeLists.txt

@@ -3,7 +3,7 @@ common:
   tags:
     - drivers
     - spi
-    - ci_tests_drivers_spi
+    - ci_tests_zephyr_drivers_spi
   harness: ztest
   harness_config:
     fixture: gpio_spi_loopback

samples/drivers/i2c/rtio_loopback/README.txt samples/zephyr/drivers/i2c/rtio_loopback/README.txt

@@ -3,7 +3,7 @@ common:
   tags:
     - drivers
     - spi
-    - ci_tests_drivers_spi
+    - ci_tests_zephyr_drivers_spi
   harness: ztest
   harness_config:
     fixture: gpio_spi_loopback

samples/drivers/i2c/rtio_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.conf samples/zephyr/drivers/i2c/rtio_loopback/boards/nrf54l09pdk_nrf54l09_cpuapp.conf

@@ -4,7 +4,7 @@ common:
     - drivers
     - spi
     - dma
-    - ci_tests_drivers_spi
+    - ci_tests_zephyr_drivers_spi
   filter: dt_compat_enabled("test-spi-loopback-slow") and
           dt_compat_enabled("test-spi-loopback-fast")
   harness: ztest