samples: matter: Matter samples configurations selection

samples/matter/light_bulb/sample.yaml

@@ -2,22 +2,6 @@ sample:
   description: Matter Light Bulb example
   name: Matter Light Bulb
 tests:
-  # Excluded in quarantine.yaml to limit resources usage in integration builds
-  sample.matter.light_bulb.release:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.light_bulb.smp_dfu:
-    build_only: true
-    extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
   sample.matter.light_bulb.ffs:
     build_only: true
     extra_args: >
@@ -26,24 +10,5 @@ tests:
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  sample.matter.light_bulb.no_dfu:
-    build_only: true
-    extra_args: CONF_FILE=prj_no_dfu.conf
-    integration_platforms:
-      - nrf21540dk_nrf52840
-    platform_allow: >
-      nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-      nrf7002dk_nrf5340_cpuapp
-  # ---------------
-  sample.matter.light_bulb.debug:
-    build_only: true
-    integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
+      - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.light_bulb.nrf7002_ek:
-    build_only: true
-    extra_args: SHIELD=nrf7002ek hci_rpmsg_SHIELD=nrf7002ek_coex
-    integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf5340dk_nrf5340_cpuapp

samples/matter/light_switch/sample.yaml

@@ -2,32 +2,10 @@ sample:
   description: Matter Light Switch example
   name: Matter Light Switch
 tests:
-  # Excluded in quarantine.yaml to limit resources usage in integration builds
-  sample.matter.light_switch.release:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.light_switch.smp_dfu:
-    build_only: true
-    extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  sample.matter.light_switch.no_dfu:
-    build_only: true
-    extra_args: CONF_FILE=prj_no_dfu.conf
-    integration_platforms:
-      - nrf21540dk_nrf52840
-    platform_allow: >
-      nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
   sample.matter.light_switch.debug:
     build_only: true
     integration_platforms:
+      - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
       - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp

samples/matter/lock/sample.yaml

@@ -2,14 +2,6 @@ sample:
   description: Matter Lock example
   name: Matter Lock
 tests:
-  # Excluded in quarantine.yaml to limit resources usage in integration builds
-  sample.matter.lock.debug:
-    build_only: true
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
   sample.matter.lock.release:
     build_only: true
     extra_args: CONF_FILE=prj_release.conf
@@ -33,9 +25,9 @@ tests:
       - nrf21540dk_nrf52840
     platform_allow: >
       nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.lock.release.nrf21540ek:
+  sample.matter.lock.debug.nrf21540ek:
     build_only: true
-    extra_args: CONF_FILE=prj_release.conf SHIELD=nrf21540ek
+    extra_args: SHIELD=nrf21540ek
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
@@ -58,6 +50,7 @@ tests:
     extra_args: CONFIG_CHIP_NUS=y CONFIG_BT_FIXED_PASSKEY=y CONFIG_CHIP_NUS_FIXED_PASSKEY=112233
     integration_platforms:
       - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
   sample.matter.lock.factory_data:
     build_only: true
@@ -67,4 +60,6 @@ tests:
       CONFIG_CHIP_FACTORY_DATA_GENERATE_ONBOARDING_CODES=y
     integration_platforms:
       - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp

samples/matter/template/sample.yaml

@@ -2,25 +2,10 @@ sample:
   description: Matter Template sample
   name: Matter Template
 tests:
-  # Excluded in quarantine.yaml to limit resources usage in integration builds
-  sample.matter.template.release:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.template.no_dfu:
-    build_only: true
-    extra_args: CONF_FILE=prj_no_dfu.conf
-    integration_platforms:
-      - nrf21540dk_nrf52840
-    platform_allow: >
-      nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
   sample.matter.template.debug:
     build_only: true
     integration_platforms:
+      - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
       - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp

samples/matter/thermostat/sample.yaml

@@ -9,11 +9,3 @@ tests:
       - nrf5340dk_nrf5340_cpuapp
       - nrf7002dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.thermostat.release:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp

samples/matter/window_covering/sample.yaml

@@ -2,30 +2,9 @@ sample:
   description: Matter Window Covering example
   name: Matter Window Covering
 tests:
-  # Excluded in quarantine.yaml to limit resources usage in integration builds
-  sample.matter.window_cover.release:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  sample.matter.window_cover.smp_dfu:
-    build_only: true
-    extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  # ---------------
   sample.matter.window_cover.debug:
     build_only: true
     integration_platforms:
+      - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  sample.matter.window_cover.no_dfu:
-    build_only: true
-    extra_args: CONF_FILE=prj_no_dfu.conf
-    integration_platforms:
-      - nrf21540dk_nrf52840
-    platform_allow: nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp

scripts/quarantine_integration.yaml

@@ -2,71 +2,33 @@
 # To use with "quarantine-list" twister argument.
 
 - scenarios:
-    - sample.matter.lock.debug
     - sample.matter.lock.release
-    - sample.matter.lock.no_dfu
-    - sample.matter.light_bulb.release
-    - sample.matter.light_bulb.smp_dfu
-    - sample.matter.light_bulb.ffs
-    - sample.matter.light_bulb.no_dfu
-    - sample.matter.light_switch.release
-    - sample.matter.light_switch.smp_dfu
-    - sample.matter.template.debug
-    - sample.matter.template.release
-    - sample.matter.template.no_dfu
-    - sample.matter.window_cover.release
-    - sample.matter.window_cover.smp_dfu
-    - sample.matter.thermostat.release
+    - sample.matter.lock.factory_data
+    - sample.matter.light_switch.debug
+    - sample.matter.thermostat.debug
   platforms:
     - nrf52840dk_nrf52840
   comment: "Configurations excluded to limit resources usage in integration builds"
 
 - scenarios:
-    - sample.matter.light_bulb.*
-    - sample.matter.light_switch.*
-    - sample.matter.template.*
-    - sample.matter.lock.*
-  platforms:
-    - nrf21540dk_nrf52840
-  comment: "Configurations excluded to limit resources usage in integration builds"
-
-- scenarios:
-    - sample.matter.lock.debug
-    - sample.matter.lock.release
-    - sample.matter.lock.no_dfu
-    - sample.matter.light_bulb.release
-    - sample.matter.light_bulb.smp_dfu
+    - sample.matter.lock.nus
+    - sample.matter.lock.factory_data
+    - sample.matter.window_cover.debug
+    - sample.matter.template.debug
     - sample.matter.light_bulb.ffs
-    - sample.matter.light_bulb.no_dfu
-    - sample.matter.light_switch.release
-    - sample.matter.light_switch.smp_dfu
-    - sample.matter.template.release
-    - sample.matter.template.no_dfu
-    - sample.matter.window_cover.release
-    - sample.matter.window_cover.smp_dfu
-    - sample.matter.thermostat.debug
-    - sample.matter.thermostat.release
   platforms:
     - nrf5340dk_nrf5340_cpuapp
   comment: "Configurations excluded to limit resources usage in integration builds"
 
 - scenarios:
-    - sample.matter.lock.debug
-    - sample.matter.lock.release
-    - sample.matter.lock.no_dfu
-    - sample.matter.light_bulb.*
-    - sample.matter.light_switch.release
-    - sample.matter.light_switch.smp_dfu
-    - sample.matter.light_switch.no_dfu
-    - sample.matter.template.release
-    - sample.matter.thermostat.debug
+    - applications.matter_weather_station.debug
+    - applications.matter_weather_station.release
   platforms:
-    - nrf7002dk_nrf5340_cpuapp
+    - thingy53_nrf5340_cpuapp
   comment: "Configurations excluded to limit resources usage in integration builds"
 
 - scenarios:
-    - applications.matter_weather_station.debug
-    - applications.matter_weather_station.release
+    - sample.matter.lock.release
   platforms:
-    - thingy53_nrf5340_cpuapp
+    - nrf7002dk_nrf5340_cpuapp
   comment: "Configurations excluded to limit resources usage in integration builds"