From 61157f99917090d672e2380218cd2f144b80d9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szablowski?= Date: Tue, 27 Aug 2024 13:30:07 +0200 Subject: [PATCH] samples: matter: update matter samples naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- samples/matter/light_bulb/sample.yaml | 10 ++++++++-- samples/matter/light_switch/sample.yaml | 10 ++++++++-- samples/matter/lock/sample.yaml | 22 ++++++++++++++++++---- samples/matter/template/sample.yaml | 6 +++--- samples/matter/thermostat/sample.yaml | 10 ++++++++-- samples/matter/window_covering/sample.yaml | 10 ++++++++-- scripts/quarantine_integration.yaml | 10 +++++----- 7 files changed, 58 insertions(+), 20 deletions(-) diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index 80ebd0ad5c15..e7fc7a6d6120 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -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 @@ -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 diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index 03c9b8ee5bbe..430b81b0a2ca 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -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 @@ -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 diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index 1972d7a80dfc..b8d9abe1adda 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -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 @@ -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 @@ -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 diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 28b58987b2d3..215a3c9d0610 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -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 @@ -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 diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index 8d4f990d1436..df1bf74b9407 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -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 @@ -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 diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index 426e6b712872..2ddbd70894b7 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -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 @@ -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 diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index 5232e3f1ed97..4a7f4e7a3d43 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -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"