samples/tests: Use board revisions

Updates boards so that the correct revision/revisions is/are tested Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 year ago · 5ee6058710
54 changed files with 84 additions and 81 deletions
--- a/samples/application_development/sysbuild/with_mcuboot/sample.yaml
+++ b/samples/application_development/sysbuild/with_mcuboot/sample.yaml
@ -7,7 +7,7 @@ tests:
				@@ -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
--- a/samples/basic/minimal/sample.yaml
+++ b/samples/basic/minimal/sample.yaml
@ -13,7 +13,7 @@ tests:
				@@ -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:
				@@ -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:
				@@ -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:
				@@ -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:
				@@ -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
--- a/samples/boards/nrf/nrfx/sample.yaml
+++ b/samples/boards/nrf/nrfx/sample.yaml
@ -4,7 +4,7 @@ tests:
				@@ -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
--- a/samples/boards/nrf/nrfx_prs/sample.yaml
+++ b/samples/boards/nrf/nrfx_prs/sample.yaml
@ -4,10 +4,10 @@ tests:
				@@ -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:
--- a/samples/boards/reel_board/mesh_badge/sample.yaml
+++ b/samples/boards/reel_board/mesh_badge/sample.yaml
@ -2,8 +2,8 @@ sample:
				@@ -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
--- a/samples/boards/stm32/uart/single_wire/sample.yaml
+++ b/samples/boards/stm32/uart/single_wire/sample.yaml
@ -2,7 +2,7 @@ sample:
				@@ -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
--- a/samples/drivers/counter/alarm/sample.yaml
+++ b/samples/drivers/counter/alarm/sample.yaml
@ -11,7 +11,7 @@ tests:
				@@ -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
--- a/samples/drivers/dac/sample.yaml
+++ b/samples/drivers/dac/sample.yaml
@ -39,7 +39,7 @@ tests:
				@@ -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
--- a/samples/drivers/display/sample.yaml
+++ b/samples/drivers/display/sample.yaml
@ -8,8 +8,8 @@ tests:
				@@ -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
--- a/samples/drivers/led_pwm/sample.yaml
+++ b/samples/drivers/led_pwm/sample.yaml
@ -6,7 +6,7 @@ tests:
				@@ -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:
--- a/samples/drivers/soc_flash_nrf/sample.yaml
+++ b/samples/drivers/soc_flash_nrf/sample.yaml
@ -4,8 +4,8 @@ tests:
				@@ -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:
--- a/samples/drivers/watchdog/sample.yaml
+++ b/samples/drivers/watchdog/sample.yaml
@ -38,7 +38,7 @@ tests:
				@@ -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:
				@@ -65,7 +65,7 @@ tests:
      - nucleo_l152re
      - nucleo_wb55rg
      - nucleo_wl55jc
-      - stm32f3_disco
+      - stm32f3_disco@B
      - stm32l562e_dk
      - disco_l475_iot1
      - stm32h573i_dk
--- a/samples/net/wifi/sample.yaml
+++ b/samples/net/wifi/sample.yaml
@ -11,7 +11,7 @@ tests:
				@@ -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:
--- a/samples/net/zperf/sample.yaml
+++ b/samples/net/zperf/sample.yaml
@ -71,7 +71,7 @@ tests:
				@@ -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
--- a/samples/sensor/accel_polling/sample.yaml
+++ b/samples/sensor/accel_polling/sample.yaml
@ -19,8 +19,8 @@ tests:
				@@ -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
--- a/samples/sensor/apds9960/sample.yaml
+++ b/samples/sensor/apds9960/sample.yaml
@ -3,9 +3,9 @@ sample:
				@@ -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:
				@@ -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
--- a/samples/sensor/die_temp_polling/sample.yaml
+++ b/samples/sensor/die_temp_polling/sample.yaml
@ -7,7 +7,7 @@ tests:
				@@ -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
--- a/samples/sensor/fdc2x1x/sample.yaml
+++ b/samples/sensor/fdc2x1x/sample.yaml
@ -5,6 +5,6 @@ tests:
				@@ -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
--- a/samples/sensor/fxos8700/sample.yaml
+++ b/samples/sensor/fxos8700/sample.yaml
@ -33,7 +33,7 @@ tests:
				@@ -33,7 +33,7 @@ tests:
      - frdm_kl25z
      - bbc_microbit
      - lpcxpresso55s69_cpu0
-      - reel_board
+      - reel_board@1
      - mimxrt685_evk
      - mimxrt595_evk/mimxrt595s/cm33
    integration_platforms:
--- a/samples/sensor/magn_polling/sample.yaml
+++ b/samples/sensor/magn_polling/sample.yaml
@ -9,5 +9,5 @@ tests:
				@@ -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
--- a/samples/sensor/ti_hdc/sample.yaml
+++ b/samples/sensor/ti_hdc/sample.yaml
@ -4,9 +4,9 @@ tests:
				@@ -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
--- a/samples/subsys/debug/debugmon/sample.yaml
+++ b/samples/subsys/debug/debugmon/sample.yaml
@ -3,5 +3,5 @@ sample:
				@@ -3,5 +3,5 @@ sample:
 tests:
  sample.debug.debugmon:
    build_only: true
-    platform_allow: reel_board
+    platform_allow: reel_board@1
    tags: debug
--- a/samples/subsys/display/cfb/sample.yaml
+++ b/samples/subsys/display/cfb/sample.yaml
@ -10,4 +10,4 @@ tests:
				@@ -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
--- a/samples/subsys/display/cfb_custom_font/sample.yaml
+++ b/samples/subsys/display/cfb_custom_font/sample.yaml
@ -6,4 +6,4 @@ sample:
				@@ -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
--- a/samples/subsys/display/cfb_shell/sample.yaml
+++ b/samples/subsys/display/cfb_shell/sample.yaml
@ -10,4 +10,4 @@ tests:
				@@ -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
--- a/samples/subsys/mgmt/osdp/control_panel/sample.yaml
+++ b/samples/subsys/mgmt/osdp/control_panel/sample.yaml
@ -8,7 +8,8 @@ common:
				@@ -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
--- a/samples/subsys/mgmt/osdp/peripheral_device/sample.yaml
+++ b/samples/subsys/mgmt/osdp/peripheral_device/sample.yaml
@ -8,7 +8,8 @@ common:
				@@ -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
--- a/samples/subsys/shell/fs/sample.yaml
+++ b/samples/subsys/shell/fs/sample.yaml
@ -9,12 +9,12 @@ common:
				@@ -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
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@ -12,7 +12,7 @@ tests:
				@@ -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:
--- a/samples/tfm_integration/psa_protected_storage/sample.yaml
+++ b/samples/tfm_integration/psa_protected_storage/sample.yaml
@ -7,7 +7,7 @@ common:
				@@ -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
--- a/samples/tfm_integration/tfm_ipc/sample.yaml
+++ b/samples/tfm_integration/tfm_ipc/sample.yaml
@ -11,7 +11,7 @@ tests:
				@@ -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
--- a/samples/tfm_integration/tfm_psa_test/sample.yaml
+++ b/samples/tfm_integration/tfm_psa_test/sample.yaml
@ -5,8 +5,8 @@ common:
				@@ -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
--- a/samples/tfm_integration/tfm_regression_test/sample.yaml
+++ b/samples/tfm_integration/tfm_regression_test/sample.yaml
@ -6,8 +6,8 @@ common:
				@@ -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
--- a/samples/tfm_integration/tfm_secure_partition/sample.yaml
+++ b/samples/tfm_integration/tfm_secure_partition/sample.yaml
@ -5,7 +5,7 @@ common:
				@@ -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
--- a/tests/arch/arm/arm_no_multithreading/testcase.yaml
+++ b/tests/arch/arm/arm_no_multithreading/testcase.yaml
@ -12,7 +12,7 @@ tests:
				@@ -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
--- a/tests/boot/with_mcumgr/testcase.yaml
+++ b/tests/boot/with_mcumgr/testcase.yaml
@ -3,7 +3,7 @@ common:
				@@ -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
--- a/tests/drivers/clock_control/clock_control_api/testcase.yaml
+++ b/tests/drivers/clock_control/clock_control_api/testcase.yaml
@ -7,7 +7,7 @@ tests:
				@@ -7,7 +7,7 @@ tests:
      - nrf51dk/nrf51822
      - nrf52dk/nrf52832
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
    integration_platforms:
      - nrf51dk/nrf51822
  drivers.clock.clock_control_nrf5_lfclk_rc:
--- a/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
+++ b/tests/drivers/clock_control/nrf_lf_clock_start/testcase.yaml
@ -10,7 +10,7 @@ tests:
				@@ -10,7 +10,7 @@ tests:
      - nrf51dk/nrf51822
      - nrf52dk/nrf52832
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
      - nrf5340dk/nrf5340/cpuapp
      - nrf5340dk/nrf5340/cpunet
    extra_configs:
@ -24,7 +24,7 @@ tests:
				@@ -24,7 +24,7 @@ tests:
      - nrf51dk/nrf51822
      - nrf52dk/nrf52832
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
      - nrf5340dk/nrf5340/cpuapp
      - nrf5340dk/nrf5340/cpunet
    extra_configs:
@ -38,7 +38,7 @@ tests:
				@@ -38,7 +38,7 @@ tests:
      - nrf51dk/nrf51822
      - nrf52dk/nrf52832
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
      - nrf5340dk/nrf5340/cpuapp
      - nrf5340dk/nrf5340/cpunet
    integration_platforms:
--- a/tests/drivers/clock_control/onoff/testcase.yaml
+++ b/tests/drivers/clock_control/onoff/testcase.yaml
@ -7,6 +7,6 @@ tests:
				@@ -7,6 +7,6 @@ tests:
      - nrf51dk/nrf51822
      - nrf52dk/nrf52832
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
    integration_platforms:
      - nrf51dk/nrf51822
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/testcase.yaml
@ -186,14 +186,14 @@ tests:
				@@ -186,14 +186,14 @@ tests:
    extra_args: DTC_OVERLAY_FILE="boards/clear_f0_f1_f3_clocks.overlay;boards/hsi_8.overlay"
    platform_allow:
      - nucleo_f091rc
-      - stm32f3_disco
+      - stm32f3_disco@B
    integration_platforms:
      - nucleo_f091rc
  drivers.clock.stm32_clock_configuration.common_core.f0_f3.sysclksrc_hse_8:
    extra_args: DTC_OVERLAY_FILE="boards/clear_f0_f1_f3_clocks.overlay;boards/hse_8_bypass.overlay"
    platform_allow:
      - nucleo_f091rc
-      - stm32f3_disco
+      - stm32f3_disco@B
    integration_platforms:
      - nucleo_f091rc
  drivers.clock.stm32_clock_configuration.common_core.f0_f3.sysclksrc_pll_32_hsi_8:
@ -201,7 +201,7 @@ tests:
				@@ -201,7 +201,7 @@ tests:
      DTC_OVERLAY_FILE="boards/clear_f0_f1_f3_clocks.overlay;boards/f0_f3_pll_32_hsi_8.overlay"
    platform_allow:
      - nucleo_f091rc
-      - stm32f3_disco
+      - stm32f3_disco@B
    integration_platforms:
      - nucleo_f091rc
  drivers.clock.stm32_clock_configuration.common_core.f0_f3.sysclksrc_pll_32_hse_8:
@ -209,7 +209,7 @@ tests:
				@@ -209,7 +209,7 @@ tests:
      DTC_OVERLAY_FILE="boards/clear_f0_f1_f3_clocks.overlay;boards/f0_f3_pll_32_hse_8.overlay"
    platform_allow:
      - nucleo_f091rc
-      - stm32f3_disco
+      - stm32f3_disco@B
    integration_platforms:
      - nucleo_f091rc
  drivers.clock.stm32_clock_configuration.common_core.f1.sysclksrc_hsi_8:
--- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/testcase.yaml
+++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/testcase.yaml
@ -33,4 +33,4 @@ tests:
				@@ -33,4 +33,4 @@ tests:
    platform_allow: nucleo_f091rc
  drivers.clock.stm32_clock_configuration.common_device.f3.i2c1_hsi:
    extra_args: DTC_OVERLAY_FILE="boards/f3_i2c1_hsi.overlay"
-    platform_allow: stm32f3_disco
+    platform_allow: stm32f3_disco@B
--- a/tests/drivers/dac/dac_loopback/testcase.yaml
+++ b/tests/drivers/dac/dac_loopback/testcase.yaml
@ -21,7 +21,7 @@ tests:
				@@ -21,7 +21,7 @@ tests:
      - bl653_dvk
      - bl654_dvk
      - bl5340_dvk/nrf5340/cpuapp
-      - stm32f3_disco
+      - stm32f3_disco@B
      - stm32l562e_dk
      - nucleo_l552ze_q
      - nucleo_f429zi
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@ -40,7 +40,7 @@ tests:
				@@ -40,7 +40,7 @@ tests:
    filter: (CONFIG_FLASH_HAS_DRIVER_ENABLED and CONFIG_TRUSTED_EXECUTION_NONSECURE
      and dt_label_with_parent_compat_enabled("storage_partition", "fixed-partitions"))
    integration_platforms:
-      - nrf9161dk/nrf9161/ns
+      - nrf9161dk@0.9.0/nrf9161/ns
  drivers.flash.common.stm32:
    platform_allow:
      - nucleo_f103rb
--- a/tests/drivers/flash/erase_blocks/testcase.yaml
+++ b/tests/drivers/flash/erase_blocks/testcase.yaml
@ -13,5 +13,5 @@ tests:
				@@ -13,5 +13,5 @@ tests:
    platform_allow:
      - sam_v71_xult/samv71q21
      - b_u585i_iot02a
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
      - nrf5340dk/nrf5340/cpuapp
--- a/tests/drivers/i2c/i2c_target_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_target_api/testcase.yaml
@ -15,7 +15,7 @@ tests:
				@@ -15,7 +15,7 @@ tests:
      - nucleo_g474re
      - nucleo_f091rc
      - stm32f072b_disco
-      - stm32f3_disco
+      - stm32f3_disco@B
      - nucleo_g071rb
      - nucleo_f207zg
      - nucleo_f429zi
--- a/tests/drivers/regulator/fixed/testcase.yaml
+++ b/tests/drivers/regulator/fixed/testcase.yaml
@ -10,8 +10,8 @@ tests:
				@@ -10,8 +10,8 @@ tests:
    platform_allow:
      - nrf52840dk/nrf52840
      - nrf5340dk/nrf5340/cpuapp
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
    integration_platforms:
      - nrf52840dk/nrf52840
      - nrf5340dk/nrf5340/cpuapp
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
--- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
+++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml
@ -6,7 +6,7 @@ common:
				@@ -6,7 +6,7 @@ common:
  harness: ztest
  platform_allow:
    - nrf52840dk/nrf52840
-    - nrf9160dk/nrf9160
+    - nrf9160dk@0.14.0/nrf9160
    - nrf5340dk/nrf5340/cpuapp
    - nrf52_bsim
  integration_platforms:
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@ -23,7 +23,7 @@ tests:
				@@ -23,7 +23,7 @@ tests:
      - nucleo_f091rc
      - nucleo_f103rb
      - nucleo_f207zg
-      - stm32f3_disco
+      - stm32f3_disco@B
      - nucleo_f429zi
      - nucleo_f746zg
      - nucleo_g071rb
@ -54,7 +54,7 @@ tests:
				@@ -54,7 +54,7 @@ tests:
      - nucleo_f091rc
      - nucleo_f103rb
      - nucleo_f207zg
-      - stm32f3_disco
+      - stm32f3_disco@B
      - nucleo_f429zi
      - nucleo_f746zg
      - nucleo_g071rb
--- a/tests/kernel/gen_isr_table/testcase.yaml
+++ b/tests/kernel/gen_isr_table/testcase.yaml
@ -23,7 +23,8 @@ tests:
				@@ -23,7 +23,8 @@ tests:
      - stmf103_mini
      - nucleo_f103rb
      - olimexino_stm32
-      - stm32_min_dev
+      - stm32_min_dev@black
+      - stm32_min_dev@blue
      - usb_kw24d512
      - v2m_beetle
      - cc1352r1_launchxl
--- a/tests/kernel/mem_protect/mem_protect/testcase.yaml
+++ b/tests/kernel/mem_protect/mem_protect/testcase.yaml
@ -25,7 +25,7 @@ tests:
				@@ -25,7 +25,7 @@ tests:
    platform_allow:
      - efr32_radio/efr32mg21a020f1024im32
      - mps3/an547
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
    integration_platforms:
      - mps3/an547
    extra_args: CONFIG_MPU_GAP_FILLING=y
--- a/tests/kernel/mem_protect/userspace/testcase.yaml
+++ b/tests/kernel/mem_protect/userspace/testcase.yaml
@ -24,7 +24,7 @@ tests:
				@@ -24,7 +24,7 @@ tests:
    platform_allow:
      - efr32_radio/efr32mg21a020f1024im32
      - mps3/an547
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
    integration_platforms:
      - mps3/an547
    extra_args: CONFIG_MPU_GAP_FILLING=y
--- a/tests/kernel/threads/no-multithreading/testcase.yaml
+++ b/tests/kernel/threads/no-multithreading/testcase.yaml
@ -8,7 +8,7 @@ tests:
				@@ -8,7 +8,7 @@ tests:
      - mps2/an385
      - mps2/an521/cpu0
      - nrf52840dk/nrf52840
-      - nrf9160dk/nrf9160
+      - nrf9160dk@0.14.0/nrf9160
      - nrf51dk/nrf51822
      - nsim/nsim_em
      - nsim/nsim_em7d_v22
--- a/tests/misc/test_build/testcase.yaml
+++ b/tests/misc/test_build/testcase.yaml
@ -2,7 +2,7 @@ tests:
				@@ -2,7 +2,7 @@ tests:
  buildsystem.debug.build:
    platform_exclude:
      - lpcxpresso55s69_ns
-      - nrf9160dk/nrf9160/ns
+      - nrf9160dk@0.14.0/nrf9160/ns
      - nrf5340dk/nrf5340/cpuapp/ns
    build_only: true
    extra_args: CONF_FILE=debug.conf
--- a/tests/subsys/logging/log_immediate/testcase.yaml
+++ b/tests/subsys/logging/log_immediate/testcase.yaml
@ -10,7 +10,7 @@ tests:
				@@ -10,7 +10,7 @@ tests:
    timeout: 80
    platform_exclude:
      - nucleo_l053r8
-      - nucleo_f030r8
+      - nucleo_f030r8@1
      - stm32f0_disco
      - nrf52_bsim
  logging.immediate.clean_output:
@ -21,6 +21,6 @@ tests:
				@@ -21,6 +21,6 @@ tests:
    timeout: 80
    platform_exclude:
      - nucleo_l053r8
-      - nucleo_f030r8
+      - nucleo_f030r8@1
      - stm32f0_disco
      - nrf52_bsim