Merge branch 'TC-SC-4.3-python-test' of https://github.com/raul-marqu…

…ez-csa/connectedhomeip into TC-SC-4.3-python-test

.github/workflows/chef.yaml

@@ -56,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             options: --user root
 
         steps:
@@ -77,7 +77,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:54
+            image: ghcr.io/project-chip/chip-build-nrf-platform:65
             options: --user root
 
         steps:

.github/workflows/examples-esp32.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -126,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

.github/workflows/examples-nrfconnect.yaml

@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:54
+            image: ghcr.io/project-chip/chip-build-nrf-platform:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -78,119 +78,119 @@ jobs:
             - name: Build example nRF Connect SDK Lock App on nRF52840 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lock-app nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh lock-app nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 lock-app \
-                    examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lighting App on nRF52840 Dongle
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONF_FILE=prj_no_dfu.conf -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle/nrf52840 -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dongle_nrf52840 lighting-app \
-                    examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lighting App on nRF52840 DK with RPC
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk/nrf52840 -DOVERLAY_CONFIG=rpc.overlay
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840+rpc lighting-app \
-                    examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Light Switch App on nRF52840 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh light-switch-app nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh light-switch-app nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 light-switch-app \
-                    examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Shell on nRF52840 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.shell == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh shell nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh shell nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 shell \
-                    examples/shell/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/shell/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Pump App on nRF52840 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh pump-app nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh pump-app nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 pump-app \
-                    examples/pump-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/pump-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Pump Controller App on nRF52840 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh pump-controller-app nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh pump-controller-app nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 pump-controller-app \
-                    examples/pump-controller-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/pump-controller-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK All Clusters App on nRF52840 DK
               run: |
-                  scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840
+                  scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk/nrf52840
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 all-clusters-app \
-                    examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK All Clusters Minimal App on nRF52840 DK
               run: |
-                  scripts/examples/nrfconnect_example.sh all-clusters-minimal-app nrf52840dk_nrf52840 -DCONF_FILE=prj_dfu.conf
+                  scripts/examples/nrfconnect_example.sh all-clusters-minimal-app nrf52840dk/nrf52840 -DFILE_SUFFIX=dfu
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840 all-clusters-minimal-app \
-                    examples/all-clusters-minimal-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/all-clusters-minimal-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lock App on nRF5340 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lock-app nrf5340dk_nrf5340_cpuapp
+                  scripts/examples/nrfconnect_example.sh lock-app nrf5340dk/nrf5340/cpuapp
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf5340dk_nrf5340_cpuapp lock-app \
-                    examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lighting App on nRF5340 DK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf5340dk_nrf5340_cpuapp
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf5340dk/nrf5340/cpuapp
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf5340dk_nrf5340_cpuapp lighting-app \
-                    examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lock App on nRF7002 PDK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lock-app nrf7002dk_nrf5340_cpuapp
+                  scripts/examples/nrfconnect_example.sh lock-app nrf7002dk/nrf5340/cpuapp
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf7002dk_nrf5340_cpuapp lock-app \
-                    examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Light Switch App on nRF7002 PDK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh light-switch-app nrf7002dk_nrf5340_cpuapp
+                  scripts/examples/nrfconnect_example.sh light-switch-app nrf7002dk/nrf5340/cpuapp
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf7002dk_nrf5340_cpuapp light-switch-app \
-                    examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK Lighting App on nRF7002 PDK
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf7002dk_nrf5340_cpuapp
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf7002dk/nrf5340/cpuapp
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf7002dk_nrf5340_cpuapp lighting-app \
-                    examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Build example nRF Connect SDK All Clusters App on nRF7002 PDK
               run: |
-                  scripts/examples/nrfconnect_example.sh all-clusters-app nrf7002dk_nrf5340_cpuapp -DCONF_FILE=prj_release.conf
+                  scripts/examples/nrfconnect_example.sh all-clusters-app nrf7002dk/nrf5340/cpuapp -DFILE_SUFFIX=release
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf7002dk_nrf5340_cpuapp all-clusters-app \
-                    examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
+                    examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
             - name: Run unit tests for Zephyr native_posix_64 platform
               if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'

.github/workflows/lint.yml

@@ -98,7 +98,6 @@ jobs:
                      --known-failure controller/ExamplePersistentStorage.cpp \
                      --known-failure controller/ExamplePersistentStorage.h \
                      --known-failure app/AttributeAccessToken.h \
-                     --known-failure app/CommandHandlerInterface.h \
                      --known-failure app/CommandResponseSender.h \
                      --known-failure app/CommandSenderLegacyCallback.h \
                      --known-failure app/ReadHandler.h \

.github/workflows/qemu.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:54
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:65
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/release_artifacts.yaml

@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:54
+            image: ghcr.io/project-chip/chip-build-esp32:65
 
         steps:
             - name: Checkout

.github/workflows/tests.yaml

@@ -577,6 +577,8 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_1.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_3.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_4.py'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SC_7_1.py'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SWTCH.py'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
@@ -586,6 +588,7 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
+                  scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
 
             - name: Uploading core files
               uses: actions/upload-artifact@v4

.gitmodules

@@ -97,11 +97,6 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos
 	url = https://github.com/Infineon/abstraction-rtos
 	platforms = infineon
-[submodule "p6/bluetooth-freertos"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos
-	url = https://github.com/Infineon/bluetooth-freertos
-	branch  = v2.X
-	platforms = infineon
 [submodule "p6/btstack"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack
 	url = https://github.com/Infineon/btstack
@@ -134,10 +129,6 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1
 	url = https://github.com/Infineon/mtb-pdl-cat1
 	platforms = infineon
-[submodule "p6/psoc6cm0p"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p
-	url = https://github.com/Infineon/psoc6cm0p
-	platforms = infineon
 [submodule "p6/whd-bsp-integration"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration
 	url = https://github.com/Infineon/whd-bsp-integration
@@ -185,10 +176,6 @@
 [submodule "third_party/jsoncpp/repo"]
 	path = third_party/jsoncpp/repo
 	url = https://github.com/open-source-parsers/jsoncpp.git
-[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
-	url = https://github.com/Infineon/anycloud-ota
-	platforms = infineon
 [submodule "third_party/mbed-mcu-boot/repo"]
 	path = third_party/mbed-mcu-boot/repo
 	url = https://github.com/ATmobica/mcuboot.git
@@ -312,10 +299,6 @@
 	url = https://github.com/STMicroelectronics/STM32CubeWB.git
 	branch = v1.18.0
 	platforms = stm32
-[submodule "p6/lwip-network-interface-integration"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
-	url = https://github.com/Infineon/lwip-network-interface-integration.git
-	platforms = infineon
 [submodule "third_party/infineon/trustm/optiga-trust-m"]
 	path = third_party/infineon/trustm/optiga-trust-m
 	url = https://github.com/Infineon/optiga-trust-m.git
@@ -326,3 +309,27 @@
 	url = https://github.com/NXP/nxp_matter_support.git
 	branch = master
 	platforms = nxp
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration
+	url = https://github.com/Infineon/btstack-integration.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p
+	url = https://github.com/Infineon/cat1cm0p.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cmsis"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/cmsis
+	url = https://github.com/Infineon/cmsis.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction
+	url = https://github.com/Infineon/ota-bootloader-abstraction.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-update"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-update
+	url = https://github.com/Infineon/ota-update.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
+	url = https://github.com/Infineon/lwip-network-interface-integration.git
+	platforms = infineon

config/nrfconnect/.nrfconnect-recommended-revision

@@ -1 +1 @@
-v2.6.0
+v2.7.0