samples/tests: Use board revisions

Updates boards so that the correct revision/revisions is/are tested Signed-off-by: Jamie McCrae <[email protected]>
zephyrproject-rtos · Feb 28, 2024 · 2ff73cc · 2ff73cc
1 parent 307f688
commit 2ff73cc
Show file tree

Hide file tree

Showing 54 changed files with 84 additions and 81 deletions.
diff --git a/samples/application_development/sysbuild/with_mcuboot/sample.yaml b/samples/application_development/sysbuild/with_mcuboot/sample.yaml
@@ -7,7 +7,7 @@ tests:
     # Platform allowed is used as twister using sysbuild still lacks proper
     # filtering support, see discussion in #49552.
     platform_allow:
-      - reel_board
+      - reel_board@1
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52840dk/nrf52840

diff --git a/samples/basic/minimal/sample.yaml b/samples/basic/minimal/sample.yaml
@@ -13,7 +13,7 @@ tests:
     extra_args: CONF_FILE='common.conf;mt.conf;arm.conf'
     build_only: true
     platform_allow:
-      - reel_board
+      - reel_board@1
       - frdm_k64f
       - mps2/an385
       - nrf51dk/nrf51822
@@ -25,7 +25,7 @@ tests:
     extra_args: CONF_FILE='common.conf;mt.conf;no-preempt.conf;arm.conf'
     build_only: true
     platform_allow:
-      - reel_board
+      - reel_board@1
       - frdm_k64f
       - mps2/an385
       - nrf51dk/nrf51822
@@ -35,7 +35,7 @@ tests:
     extra_args: CONF_FILE='common.conf;mt.conf;no-preempt.conf;no-timers.conf;arm.conf'
     build_only: true
     platform_allow:
-      - reel_board
+      - reel_board@1
       - frdm_k64f
       - mps2/an385
       - nrf51dk/nrf51822
@@ -45,7 +45,7 @@ tests:
     extra_args: CONF_FILE='common.conf;no-mt.conf;arm.conf'
     build_only: true
     platform_allow:
-      - reel_board
+      - reel_board@1
       - frdm_k64f
       - mps2/an385
       - nrf51dk/nrf51822
@@ -55,7 +55,7 @@ tests:
     extra_args: CONF_FILE='common.conf;no-mt.conf;no-timers.conf;arm.conf'
     build_only: true
     platform_allow:
-      - reel_board
+      - reel_board@1
       - frdm_k64f
       - mps2/an385
       - nrf51dk/nrf51822

diff --git a/samples/boards/nrf/nrfx/sample.yaml b/samples/boards/nrf/nrfx/sample.yaml
@@ -4,7 +4,7 @@ tests:
   sample.boards.nrf.nrfx:
     platform_allow:
       - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
     integration_platforms:
       - nrf52840dk/nrf52840
     tags: board

diff --git a/samples/boards/nrf/nrfx_prs/sample.yaml b/samples/boards/nrf/nrfx_prs/sample.yaml
@@ -4,10 +4,10 @@ tests:
   sample.boards.nrf.nrfx_prs:
     platform_allow:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
     tags: nrfx
     harness: console
     harness_config:

diff --git a/samples/boards/reel_board/mesh_badge/sample.yaml b/samples/boards/reel_board/mesh_badge/sample.yaml
@@ -2,8 +2,8 @@ sample:
   description: reel board mesh badge sample
   name: mesh badge
 tests:
-  sample.board.reel_board.mesh_badge:
-    platform_allow: reel_board
+  sample.board.reel_board@1.mesh_badge:
+    platform_allow: reel_board@1
     tags:
       - samples
       - sensor

diff --git a/samples/boards/stm32/uart/single_wire/sample.yaml b/samples/boards/stm32/uart/single_wire/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: STM32 Single Wire UART sample
 tests:
   sample.boards.stm32.uart.single_wire:
-    platform_allow: stm32f3_disco
+    platform_allow: stm32f3_disco@B
     tags:
       - drivers
       - uart

diff --git a/samples/drivers/counter/alarm/sample.yaml b/samples/drivers/counter/alarm/sample.yaml
@@ -11,7 +11,7 @@ tests:
       - nrf51dk/nrf51822
       - nrf52dk/nrf52832
       - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
       - samd20_xpro
       - bl5340_dvk/nrf5340/cpuapp
       - gd32e103v_eval

diff --git a/samples/drivers/dac/sample.yaml b/samples/drivers/dac/sample.yaml
@@ -39,7 +39,7 @@ tests:
       - sam_e70_xplained/same70q21b
       - sam_v71_xult/samv71q21
       - sam_v71_xult/samv71q21b
-      - stm32f3_disco
+      - stm32f3_disco@B
       - stm32l562e_dk
       - twr_ke18f
       - lpcxpresso55s36

diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
@@ -8,8 +8,8 @@ tests:
       - arduino_i2c
       - arduino_spi
     platform_exclude:
-      - reel_board
-      - reel_board_v2
+      - reel_board@1
+      - reel_board@2
       - ubx_evkannab1/nrf52832
       - stm32f769i_disco
       - pan1781_evb

diff --git a/samples/drivers/led_pwm/sample.yaml b/samples/drivers/led_pwm/sample.yaml
@@ -6,7 +6,7 @@ tests:
     filter: dt_compat_enabled("pwm-leds")
     tags: LED
     depends_on: pwm
-    platform_exclude: reel_board
+    platform_exclude: reel_board@1
     timeout: 20
     harness: console
     harness_config:

diff --git a/samples/drivers/soc_flash_nrf/sample.yaml b/samples/drivers/soc_flash_nrf/sample.yaml
@@ -4,8 +4,8 @@ tests:
   sample.drivers.flash.soc_flash_nrf:
     platform_allow:
       - nrf52dk/nrf52832
-      - nrf9160dk/nrf9160
-      - nrf9160dk/nrf9160/ns
+      - nrf9160dk@0.14.0/nrf9160
+      - nrf9160dk@0.14.0/nrf9160/ns
     integration_platforms:
       - nrf52dk/nrf52832
     tags:

diff --git a/samples/drivers/watchdog/sample.yaml b/samples/drivers/watchdog/sample.yaml
@@ -38,7 +38,7 @@ tests:
       - nucleo_l152re
       - nucleo_wb55rg
       - nucleo_wl55jc
-      - stm32f3_disco
+      - stm32f3_disco@B
       - stm32l562e_dk
       - disco_l475_iot1
       - stm32h573i_dk
@@ -65,7 +65,7 @@ tests:
       - nucleo_l152re
       - nucleo_wb55rg
       - nucleo_wl55jc
-      - stm32f3_disco
+      - stm32f3_disco@B
       - stm32l562e_dk
       - disco_l475_iot1
       - stm32h573i_dk

diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml
@@ -11,7 +11,7 @@ tests:
     platform_allow:
       - cc3220sf_launchxl
       - disco_l475_iot1
-      - reel_board
+      - reel_board@1
     integration_platforms:
       - cc3220sf_launchxl
   sample.net.wifi.mikroe_wifi_bt_click:

diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml
@@ -71,7 +71,7 @@ tests:
     depends_on: usb_device
   sample.net.zperf.shield:
     harness: net
-    platform_allow: reel_board
+    platform_allow: reel_board@1
     extra_args: SHIELD=link_board_eth
     tags:
       - shield

diff --git a/samples/sensor/accel_polling/sample.yaml b/samples/sensor/accel_polling/sample.yaml
@@ -19,8 +19,8 @@ tests:
       - frdm_k64f                       # fxos8700
       - sparkfun_thing_plus/nrf9160     # lis2dh
       - thingy52/nrf52832               # lis2dh12
-      - stm32f411e_disco                # lsm303agr_accel
-      - stm32f3_disco                   # lsm303dlhc_accel
+      - stm32f411e_disco@D                # lsm303agr_accel
+      - stm32f3_disco@B                   # lsm303dlhc_accel
       - bl5340_dvk/nrf5340/cpuapp       # lis3dh
       - b_l4s5i_iot01a                  # lsm6dsl
       - sensortile_box                  # lis2dw12, lsm6dso, iisdhhc

diff --git a/samples/sensor/apds9960/sample.yaml b/samples/sensor/apds9960/sample.yaml
@@ -3,9 +3,9 @@ sample:
 tests:
   sample.sensor.apds9960:
     harness: console
-    platform_allow: reel_board
+    platform_allow: reel_board@1
     integration_platforms:
-      - reel_board
+      - reel_board@1
     tags: sensors
     depends_on:
       - i2c
@@ -19,9 +19,9 @@ tests:
       fixture: fixture_i2c_apds9960
   sample.sensor.apds9960.trigger:
     harness: console
-    platform_allow: reel_board
+    platform_allow: reel_board@1
     integration_platforms:
-      - reel_board
+      - reel_board@1
     tags: sensors
     depends_on:
       - i2c

diff --git a/samples/sensor/die_temp_polling/sample.yaml b/samples/sensor/die_temp_polling/sample.yaml
@@ -7,7 +7,7 @@ tests:
       - sensors
     filter: dt_alias_exists("die-temp0")
     integration_platforms:
-      - stm32f3_disco
+      - stm32f3_disco@B
     harness: console
     harness_config:
       type: one_line

diff --git a/samples/sensor/fdc2x1x/sample.yaml b/samples/sensor/fdc2x1x/sample.yaml
@@ -5,6 +5,6 @@ tests:
   sample.sensor.fdc2x1x:
     harness: sensor
     tags: sensors
-    platform_allow: nrf9160dk/nrf9160
+    platform_allow: nrf9160dk@0.14.0/nrf9160
     integration_platforms:
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
diff --git a/samples/sensor/fxos8700/sample.yaml b/samples/sensor/fxos8700/sample.yaml
@@ -33,7 +33,7 @@ tests:
       - frdm_kl25z
       - bbc_microbit
       - lpcxpresso55s69_cpu0
-      - reel_board
+      - reel_board@1
       - mimxrt685_evk
       - mimxrt595_evk/mimxrt595s/cm33
     integration_platforms:

diff --git a/samples/sensor/magn_polling/sample.yaml b/samples/sensor/magn_polling/sample.yaml
@@ -9,5 +9,5 @@ tests:
       - frdm_k64f               # fxos8700
       - thingy53/nrf5340/cpuapp # bmm150
       - sensortile_box          # lis2mdl
-      - stm32f411e_disco        # lsm303agr_magn
-      - stm32f3_disco           # lsm303dlhc_magn
+      - stm32f411e_disco@D        # lsm303agr_magn
+      - stm32f3_disco@B           # lsm303dlhc_magn
diff --git a/samples/sensor/ti_hdc/sample.yaml b/samples/sensor/ti_hdc/sample.yaml
@@ -4,9 +4,9 @@ tests:
   sample.sensor.ti_hdc:
     harness: sensor
     platform_allow:
-      - reel_board
+      - reel_board@1
       - nucleo_l496zg
     integration_platforms:
-      - reel_board
+      - reel_board@1
     tags: sensors
     depends_on: i2c
diff --git a/samples/subsys/debug/debugmon/sample.yaml b/samples/subsys/debug/debugmon/sample.yaml
@@ -3,5 +3,5 @@ sample:
 tests:
   sample.debug.debugmon:
     build_only: true
-    platform_allow: reel_board
+    platform_allow: reel_board@1
     tags: debug
diff --git a/samples/subsys/display/cfb/sample.yaml b/samples/subsys/display/cfb/sample.yaml
@@ -10,4 +10,4 @@ tests:
     extra_args: SHIELD=ssd1306_128x64
     tags: shield
   sample.display.cfb.ssd16xx:
-    platform_allow: reel_board
+    platform_allow: reel_board@1
diff --git a/samples/subsys/display/cfb_custom_font/sample.yaml b/samples/subsys/display/cfb_custom_font/sample.yaml
@@ -6,4 +6,4 @@ sample:
   name: cfb custom font sample
 tests:
   sample.display.cfb_custom_font.ssd16xx:
-    platform_allow: reel_board
+    platform_allow: reel_board@1
diff --git a/samples/subsys/display/cfb_shell/sample.yaml b/samples/subsys/display/cfb_shell/sample.yaml
@@ -10,4 +10,4 @@ tests:
     extra_args: SHIELD=ssd1306_128x32
     tags: shield
   sample.display.cfb_shell.ssd16xx:
-    platform_allow: reel_board
+    platform_allow: reel_board@1
diff --git a/samples/subsys/mgmt/osdp/control_panel/sample.yaml b/samples/subsys/mgmt/osdp/control_panel/sample.yaml
@@ -8,7 +8,8 @@ common:
           dt_chosen_enabled("zephyr,osdp-uart") and CONFIG_SERIAL
   harness: osdp
   integration_platforms:
-    - stm32_min_dev
+    - stm32_min_dev@black
+    - stm32_min_dev@blue
 tests:
   sample.mgmt.osdp.control_panel:
     extra_args: CONF_FILE=prj.conf

diff --git a/samples/subsys/mgmt/osdp/peripheral_device/sample.yaml b/samples/subsys/mgmt/osdp/peripheral_device/sample.yaml
@@ -8,7 +8,8 @@ common:
           dt_chosen_enabled("zephyr,osdp-uart") and CONFIG_SERIAL
   harness: osdp
   integration_platforms:
-    - stm32_min_dev
+    - stm32_min_dev@black
+    - stm32_min_dev@blue
 tests:
   sample.mgmt.osdp.peripheral_device:
     extra_args: CONF_FILE=prj.conf

diff --git a/samples/subsys/shell/fs/sample.yaml b/samples/subsys/shell/fs/sample.yaml
@@ -9,12 +9,12 @@ common:
 tests:
   sample.filesystem.shell:
     platform_allow:
-      - reel_board
+      - reel_board@1
       - mimxrt1060_evk
       - mr_canhubk3
       - native_sim
     integration_platforms:
-      - reel_board
+      - reel_board@1
   sample.filesystem.shell.fuse:
     platform_allow:
       - native_sim

diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -12,7 +12,7 @@ tests:
       - csr
       - mcuboot
     platform_allow: mps2/an521/cpu0/ns v2m_musca_s1/musca_s1/ns
-      nrf5340dk/nrf5340/cpuapp/ns nrf9160dk/nrf9160/ns
+      nrf5340dk/nrf5340/cpuapp/ns nrf9160dk@0.14.0/nrf9160/ns
       stm32l562e_dk/stm32l562xx/ns bl5340_dvk/nrf5340/cpuapp/ns
     harness: console
     harness_config:

diff --git a/samples/tfm_integration/psa_protected_storage/sample.yaml b/samples/tfm_integration/psa_protected_storage/sample.yaml
@@ -7,7 +7,7 @@ common:
     - mps2/an521/cpu0/ns
     - v2m_musca_s1/musca_s1/ns
     - nrf5340dk/nrf5340/cpuapp/ns
-    - nrf9160dk/nrf9160/ns
+    - nrf9160dk@0.14.0/nrf9160/ns
     - bl5340_dvk/nrf5340/cpuapp/ns
   integration_platforms:
     - mps2/an521/cpu0/ns

diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml
@@ -11,7 +11,7 @@ tests:
     platform_allow:
       - mps2/an521/cpu0/ns
       - nrf5340dk/nrf5340/cpuapp/ns
-      - nrf9160dk/nrf9160/ns
+      - nrf9160dk@0.14.0/nrf9160/ns
       - nucleo_l552ze_q/stm32l552xx/ns
       - stm32l562e_dk/stm32l562xx/ns
       - v2m_musca_s1/musca_s1/ns

diff --git a/samples/tfm_integration/tfm_psa_test/sample.yaml b/samples/tfm_integration/tfm_psa_test/sample.yaml
@@ -5,8 +5,8 @@ common:
   platform_allow:
     - mps2/an521/cpu0/ns
     - nrf5340dk/nrf5340/cpuapp/ns
-    - nrf9160dk/nrf9160/ns
-    - nrf9161dk/nrf9161/ns
+    - nrf9160dk@0.14.0/nrf9160/ns
+    - nrf9161dk@0.9.0/nrf9161/ns
     - v2m_musca_s1/musca_s1/ns
   modules:
     - psa-arch-tests

diff --git a/samples/tfm_integration/tfm_regression_test/sample.yaml b/samples/tfm_integration/tfm_regression_test/sample.yaml
@@ -6,8 +6,8 @@ common:
     - psa-arch-tests
   platform_allow:
     - nrf5340dk/nrf5340/cpuapp/ns
-    - nrf9160dk/nrf9160/ns
-    - nrf9161dk/nrf9161/ns
+    - nrf9160dk@0.14.0/nrf9160/ns
+    - nrf9161dk@0.9.0/nrf9161/ns
     - v2m_musca_s1/musca_s1/ns
   integration_platforms:
     - nrf5340dk/nrf5340/cpuapp/ns

diff --git a/samples/tfm_integration/tfm_secure_partition/sample.yaml b/samples/tfm_integration/tfm_secure_partition/sample.yaml
@@ -5,7 +5,7 @@ common:
     - mps2/an521/cpu0/ns
     - v2m_musca_s1/musca_s1/ns
     - nrf5340dk/nrf5340/cpuapp/ns
-    - nrf9160dk/nrf9160/ns
+    - nrf9160dk@0.14.0/nrf9160/ns
   integration_platforms:
     - mps2/an521/cpu0/ns
   harness: console

diff --git a/tests/arch/arm/arm_no_multithreading/testcase.yaml b/tests/arch/arm/arm_no_multithreading/testcase.yaml
@@ -12,7 +12,7 @@ tests:
       - mps2/an521/cpu0
       - mps3/an547
       - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
       - nrf51dk/nrf51822
     integration_platforms:
       - qemu_cortex_m0
diff --git a/tests/boot/with_mcumgr/testcase.yaml b/tests/boot/with_mcumgr/testcase.yaml
@@ -3,7 +3,7 @@ common:
   platform_allow:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
-    - nrf9160dk/nrf9160
+    - nrf9160dk@0.14.0/nrf9160
   integration_platforms:
     - nrf52840dk/nrf52840
   timeout: 600