Skip to content

Commit

Permalink
samples: matter: update matter samples naming
Browse files Browse the repository at this point in the history
The PR change the sample.yamls matter naming convention to be
aligned to TAS requirement.
Additionally add auto ble pairing for nRF54L15 configuration
for test purpose, until IOA will not be supported.

Signed-off-by: Michał Szablowski <michal.szablowski@nordicsemi.no>
  • Loading branch information
doublemis1 committed Aug 27, 2024
1 parent cb750ce commit 61157f9
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 20 deletions.
10 changes: 8 additions & 2 deletions samples/matter/light_bulb/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ tests:
- nrf5340dk/nrf5340/cpuapp
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.light_bulb.release:
sysbuild: true
Expand Down Expand Up @@ -91,3 +90,10 @@ tests:
integration_platforms:
- nrf7002dk/nrf5340/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.light_bulb.mgrt_dac:
sysbuild: true
build_only: true
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
10 changes: 8 additions & 2 deletions samples/matter/light_switch/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ tests:
- nrf5340dk/nrf5340/cpuapp
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.light_switch.release:
sysbuild: true
Expand Down Expand Up @@ -62,3 +61,10 @@ tests:
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.light_switch.mgrt_dac:
sysbuild: true
build_only: true
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
22 changes: 18 additions & 4 deletions samples/matter/lock/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ tests:
- nrf7002dk/nrf5340/cpuapp/nrf7001
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp
nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54h20dk/nrf54h20/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.lock.release:
sysbuild: true
Expand All @@ -28,10 +27,9 @@ tests:
- nrf7002dk/nrf5340/cpuapp/nrf7001
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp
nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54h20dk/nrf54h20/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.lock.lto:
sysbuild: true
Expand Down Expand Up @@ -89,3 +87,19 @@ tests:
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
- nrf54l15pdk/nrf54l15/cpuapp
sample.matter.lock.mgrt_dac:
sysbuild: true
build_only: true
extra_args: CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
sample.matter.lock.release.mgrt_dac:
sysbuild: true
build_only: true
extra_args: FILE_SUFFIX=release CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
6 changes: 3 additions & 3 deletions samples/matter/template/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ tests:
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54h20dk/nrf54h20/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.template.release:
sysbuild: true
Expand Down Expand Up @@ -66,8 +65,9 @@ tests:
- nrf5340dk/nrf5340/cpuapp
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
sample.matter.template.nrf54h20.nrf7002eb:
sysbuild: true
Expand Down
10 changes: 8 additions & 2 deletions samples/matter/thermostat/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ tests:
- nrf5340dk/nrf5340/cpuapp
- nrf7002dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.thermostat.release:
sysbuild: true
Expand All @@ -39,3 +38,10 @@ tests:
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.thermostat.mgrt_dac:
sysbuild: true
build_only: true
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
10 changes: 8 additions & 2 deletions samples/matter/window_covering/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ tests:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.window_cover.release:
sysbuild: true
Expand All @@ -36,3 +35,10 @@ tests:
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp
nrf54l15pdk/nrf54l15/cpuapp
tags: sysbuild ci_samples_matter
sample.matter.window_cover.mgrt_dac:
sysbuild: true
build_only: true
integration_platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
platform_allow: nrf54l15pdk/nrf54l15/cpuapp/ns
tags: sysbuild ci_samples_matter
10 changes: 5 additions & 5 deletions scripts/quarantine_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@
comment: "Configurations excluded to limit resources usage in integration builds"

- scenarios:
- sample.matter.template.debug
- sample.matter.light_bulb.debug
- sample.matter.light_switch.debug
- sample.matter.thermostat.debug
- sample.matter.window_cover.debug
- sample.matter.template.mgrt_dac
- sample.matter.light_bulb.mgrt_dac
- sample.matter.light_switch.mgrt_dac
- sample.matter.thermostat.mgrt_dac
- sample.matter.window_cover.mgrt_dac
platforms:
- nrf54l15pdk/nrf54l15/cpuapp/ns
comment: "Configurations excluded to limit resources usage in integration Matter ns builds"
Expand Down

0 comments on commit 61157f9

Please sign in to comment.