samples: matter: Redundant FFS configurations

Remove or change configurations where FFS is not applicable for device Signed-off-by: Janusz Gąsior <janusz.gasior@nordicsemi.no>
nrfconnect · Jul 25, 2023 · 83309c4 · 83309c4
1 parent 2931b06
commit 83309c4
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 51 deletions.
diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf
@@ -72,9 +72,6 @@ CONFIG_CHIP_DFU_OVER_BT_SMP=y
 # Increase system workqueue size, as SMP is processed within it
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 
-# Enable FFS
-CONFIG_CHIP_ROTATING_DEVICE_ID=y
-CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
 # 0x0302 (Temp. sensor)
 CONFIG_CHIP_DEVICE_TYPE=770
 CONFIG_BT_RX_STACK_SIZE=1500
diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf
@@ -58,9 +58,6 @@ CONFIG_CHIP_DFU_OVER_BT_SMP=y
 # Increase system workqueue size, as SMP is processed within it
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 
-# Enable FFS
-CONFIG_CHIP_ROTATING_DEVICE_ID=y
-CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
 # 0x0302 (Temp. sensor)
 CONFIG_CHIP_DEVICE_TYPE=770
 CONFIG_BT_RX_STACK_SIZE=1500
diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml
@@ -33,45 +33,12 @@ tests:
       - nrf21540dk_nrf52840
     platform_allow: >
       nrf52840dk_nrf52840 nrf21540dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.lock.release.ffs:
-    build_only: true
-    extra_args: CONF_FILE=prj_release.conf CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
-      CONFIG_CHIP_ROTATING_DEVICE_ID=y CONFIG_CHIP_DEVICE_TYPE=10
-    integration_platforms:
-      - nrf52840dk_nrf52840
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.lock.ffs:
-    build_only: true
-    extra_args: CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
-      CONFIG_CHIP_ROTATING_DEVICE_ID=y CONFIG_CHIP_DEVICE_TYPE=10
-    integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
-  sample.matter.lock.release.smp_dfu.ffs:
-    build_only: true
-    extra_args: >
-      CONF_FILE=prj_release.conf CONFIG_CHIP_DFU_OVER_BT_SMP=y
-      CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
-      CONFIG_CHIP_ROTATING_DEVICE_ID=y CONFIG_CHIP_DEVICE_TYPE=10
-    integration_platforms:
-      - nrf5340dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
   sample.matter.lock.release.nrf21540_ek:
     build_only: true
     extra_args: CONF_FILE=prj_release.conf SHIELD=nrf21540_ek
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp
     platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
-  sample.matter.lock.smp_dfu.ffs:
-    build_only: true
-    extra_args: CONFIG_CHIP_DFU_OVER_BT_SMP=y CONFIG_CHIP_COMMISSIONABLE_DEVICE_TYPE=y
-      CONFIG_CHIP_ROTATING_DEVICE_ID=y CONFIG_CHIP_DEVICE_TYPE=10
-    integration_platforms:
-      - nrf52840dk_nrf52840
-      - nrf5340dk_nrf5340_cpuapp
-      - nrf7002dk_nrf5340_cpuapp
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf7002dk_nrf5340_cpuapp
   sample.matter.lock.switchable_thread.nrf7002_ek:
     build_only: true
     extra_args: SHIELD=nrf7002ek hci_rpmsg_SHIELD=nrf7002ek_coex

diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml
@@ -4,11 +4,7 @@
 - scenarios:
     - sample.matter.lock.debug
     - sample.matter.lock.release
-    - sample.matter.lock.smp_dfu
     - sample.matter.lock.no_dfu
-    - sample.matter.lock.release.ffs
-    - sample.matter.lock.ffs
-    - sample.matter.lock.release.smp_dfu.ffs
     - sample.matter.light_bulb.release
     - sample.matter.light_bulb.smp_dfu
     - sample.matter.light_bulb.ffs
@@ -37,11 +33,7 @@
 - scenarios:
     - sample.matter.lock.debug
     - sample.matter.lock.release
-    - sample.matter.lock.smp_dfu
     - sample.matter.lock.no_dfu
-    - sample.matter.lock.release.ffs
-    - sample.matter.lock.ffs
-    - sample.matter.lock.release.smp_dfu.ffs
     - sample.matter.light_bulb.release
     - sample.matter.light_bulb.smp_dfu
     - sample.matter.light_bulb.ffs
@@ -61,11 +53,7 @@
 - scenarios:
     - sample.matter.lock.debug
     - sample.matter.lock.release
-    - sample.matter.lock.smp_dfu
     - sample.matter.lock.no_dfu
-    - sample.matter.lock.release.ffs
-    - sample.matter.lock.ffs
-    - sample.matter.lock.release.smp_dfu.ffs
     - sample.matter.light_bulb.*
     - sample.matter.light_switch.release
     - sample.matter.light_switch.smp_dfu