Sync csa branch with main (#851)

Author: Sarthak-Shaha

.devcontainer/Dockerfile

@@ -32,17 +32,25 @@ ENV LANG=en_US.utf8
 RUN apt-get update \
     && apt-get install -y locales \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
-    && apt-get -fy install vim emacs sudo \
-    apt-utils dialog zsh \
-    lsb-release \
-    bash-completion \
-    valgrind \
-    docker.io \
-    iputils-ping \
-    icecc \
-    # emacs pulls in libgccjit0 -> libgcc-14-dev without libstdc++-14-dev which causes clang++ to fail \
-    # See-Also: https://bugs.launchpad.net/ubuntu/+source/llvm-defaults/+bug/2077130 \
-    libstdc++-14-dev \
+    && apt-get -fy install \
+        apt-utils \
+        bash-completion \
+        dialog \
+        docker.io \
+        emacs \
+        fish \
+        gnupg2 \
+        icecc \
+        iputils-ping \
+        lsb-release \
+        openssh-client \
+        sudo \
+        valgrind \
+        vim \
+        zsh \
+        # emacs pulls in libgccjit0 -> libgcc-14-dev without libstdc++-14-dev which causes clang++ to fail \
+        # See-Also: https://bugs.launchpad.net/ubuntu/+source/llvm-defaults/+bug/2077130 \
+        libstdc++-14-dev \
     && :
 
 RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \

.github/.wordlist.txt

@@ -711,6 +711,7 @@ ICD
 ICDs
 iCloud
 ICMP
+idempotency
 IDF
 IDL
 IDLs
@@ -956,6 +957,7 @@ MLD
 mmevk
 moal
 Mobly
+Mockito
 ModeSelect
 modprobe
 Modustoolbox
@@ -1037,6 +1039,7 @@ nwk
 NXP
 objcopy
 OccupancySensing
+OCMock
 OctetString
 OECORE
 OID
@@ -1242,6 +1245,9 @@ Realtek
 rebase
 recommand
 recommanded
+Reconnection
+reconnection
+reconnections
 recurse
 refrigeratoralarm
 regen

.github/workflows/build.yaml

@@ -197,13 +197,23 @@ jobs:
                   CHIP_ROOT_PATH=examples/placeholder/linux
                   CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
                   scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
-            - name: Setup Build, Run Build and Run Tests
+            - name: Setup Build, Run Build and Run Tests (gcc_release)
+              # Running gcc_release tests on pull requests is redundant
+              # it is unlikely to find extra issues beyond the other unit tests already run on PRs.
+              # Instead keep this run for master only
+              if: github.event.pull_request.number == null
               run: |
                   BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false"
                   scripts/run_in_build_env.sh "ninja -C ./out/gcc_release"
                   BUILD_TYPE=gcc_release scripts/tests/gn_tests.sh
             - name: Clean output
               run: rm -rf ./out
+            - name: Build and run AddressSanitizer (ASAN) unit tests (Pull Requests only)
+              if: github.event_name == 'pull_request'
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py --target linux-x64-tests-asan-clang build \
+                    && rm -rf out/linux-x64-tests-asan-clang"
             - name: Run Tests with sanitizers
               # Sanitizer tests are not likely to find extra issues so running the same tests
               # as above repeatedly on every pull request seems extra time. Instead keep this run

.github/workflows/darwin-tests.yaml

@@ -115,6 +115,7 @@ jobs:
                 --target darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT} \
                 --target darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT} \
                 --target darwin-${{matrix.arch}}-evse-${BUILD_VARIANT} \
+                --target darwin-${{matrix.arch}}-water-heater-${BUILD_VARIANT} \
                 --target darwin-${{matrix.arch}}-all-devices-${BUILD_VARIANT} \
                 build \
                 --copy-artifacts-to objdir-clone \
@@ -125,6 +126,7 @@ jobs:
           "./scripts/tests/run_test_suite.py \
              --runner darwin_framework_tool_python \
              --target-skip-glob '{TestAccessControlConstraints}' \
+             --test-order random \
              run \
              --iterations 1 \
              --test-timeout-seconds 120 \
@@ -142,6 +144,7 @@ jobs:
              --app-path network-manager:./objdir-clone/darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
              --app-path energy-gateway:./objdir-clone/darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
              --app-path evse:./objdir-clone/darwin-${{matrix.arch}}-evse-${BUILD_VARIANT}/chip-evse-app \
+             --app-path water-heater:./objdir-clone/darwin-${{matrix.arch}}-water-heater-${BUILD_VARIANT}/matter-water-heater-app \
           "
       - name: Run OTA Test
         run: |

.github/workflows/examples-esp32.yaml

@@ -146,6 +146,10 @@ jobs:
                 scripts/examples/esp_example.sh lighting-app sdkconfig.wifi_thread.defaults esp32c6
                 rm -rf examples/lighting-app/esp32/{build,managed_components}
 
+            - name: Build example All Clusters App (Target:ESP32P4, Ethernet)
+              run: |
+                scripts/examples/esp_example.sh all-clusters-app sdkconfig.eth.esp32p4 esp32p4
+                rm -rf examples/all-clusters-app/esp32/{build,managed_components}
 
             - name: Build example Lighting App (external platform)
               run: |
@@ -158,12 +162,18 @@ jobs:
                 scripts/examples/esp_example.sh energy-gateway-app sdkconfig.defaults
                 rm -rf examples/energy-gateway-app/esp32/{build,managed_components}
 
-            - name: Build example Energy Management App
-              if: steps.changed_paths.outputs.energy_management == 'true'
+            - name: Build example EVSE App
+              if: steps.changed_paths.outputs.evse == 'true'
               run: |
                 scripts/examples/esp_example.sh evse-app sdkconfig.defaults
                 rm -rf examples/evse-app/esp32/{build,managed_components}
 
+            - name: Build example Water Heater App
+              if: steps.changed_paths.outputs.water_heater == 'true'
+              run: |
+                scripts/examples/esp_example.sh water-heater-app sdkconfig.defaults
+                rm -rf examples/water-heater-app/esp32/{build,managed_components}
+
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
@@ -193,6 +203,9 @@ jobs:
             - name: Build example Bridge App
               run: scripts/examples/esp_example.sh bridge-app
 
+            - name: Build example All Devices App
+              run: scripts/examples/esp_example.sh all-devices-app sdkconfig.defaults
+
             - name: Build example Persistent Storage App
               run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
 

.github/workflows/tests.yaml

@@ -61,7 +61,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:181
+            image: ghcr.io/project-chip/chip-build:184
             options: >-
                 --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -120,6 +120,7 @@ jobs:
                       --log-level info \
                       src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
                       src/app/zap-templates/zcl/data-model/chip/ambient-context-sensing-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/boolean-state-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml \
@@ -282,6 +283,7 @@ jobs:
                         --target linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
                         --target linux-x64-all-clusters-${BUILD_VARIANT} \
                         --target linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT} \
+                        --target linux-x64-all-clusters-no-wifi-no-ble-openthread-endpoint-${BUILD_VARIANT} \
                         --target linux-x64-ota-requestor-${BUILD_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         --pw-command-launcher=ccache \
@@ -299,6 +301,7 @@ jobs:
                         --target linux-x64-energy-gateway-${BUILD_VARIANT} \
                         --target linux-x64-all-devices-${BUILD_VARIANT} \
                         --target linux-x64-evse-${BUILD_VARIANT} \
+                        --target linux-x64-water-heater-${BUILD_VARIANT} \
                         --pw-command-launcher=ccache \
                         build \
                         --copy-artifacts-to objdir-clone \
@@ -313,6 +316,8 @@ jobs:
                    -DCMAKE_BUILD_TYPE=Debug \
                    -DOTBR_BORDER_ROUTING=ON \
                    -DOTBR_MDNS=openthread \
+                   -DOTBR_VENDOR_NAME=MatterTest \
+                   -DOTBR_PRODUCT_NAME=MatterTest \
                    -DOT_POSIX_SETTINGS_PATH='\"tmp\"' \
                    -DOT_FIREWALL=OFF \
                    -DOT_LOG_LEVEL=INFO \
@@ -347,9 +352,6 @@ jobs:
                      "
 
             - name: Run BLE-Thread commissioning test
-              # Disabled due to flakyness. See:
-              # https://github.com/project-chip/connectedhomeip/issues/42869
-              if: false
               env:
                 # Disable TSAN bug reporting, as it reports tons of (hopefully) false positives.
                 # The reason for that is BlueZ and WPA supplicant integration which involves GIO
@@ -362,13 +364,34 @@ jobs:
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
                      --target TestOperationalState \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
                      --tool-path chip-tool:./objdir-clone/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
-                     --all-clusters-app ./objdir-clone/linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --app-path all-clusters:./objdir-clone/linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
                      --commissioning-method ble-thread \
                   "
+                  rm -rf tmp/
+
+            - name: Run Thread-MeshCoP commissioning test
+              env:
+                TSAN_OPTIONS: report_bugs=0
+              run: |
+                  PATH=$PWD/objdir-clone:$PATH ./scripts/run_in_build_env.sh \
+                  "./scripts/tests/run_test_suite.py \
+                     --find-path $PWD/objdir-clone \
+                     --find-path $PWD/scripts \
+                     --runner chip_tool_python \
+                     --target TestOperationalState \
+                     run \
+                     --iterations 1 \
+                     --test-timeout-seconds 120 \
+                     --tool-path chip-tool:./objdir-clone/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
+                     --app-path all-clusters:./objdir-clone/linux-x64-all-clusters-no-wifi-no-ble-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --commissioning-method thread-meshcop \
+                  "
+                  rm -rf tmp/
 
             - name: Run Tests using the python parser sending commands to chip-tool
               run: |
@@ -377,6 +400,7 @@ jobs:
                      --find-path $PWD/objdir-clone \
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
@@ -394,6 +418,7 @@ jobs:
                      --app-path network-manager:./objdir-clone/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
                      --app-path energy-gateway:./objdir-clone/linux-x64-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
                      --app-path evse:./objdir-clone/linux-x64-evse-${BUILD_VARIANT}/chip-evse-app \
+                     --app-path water-heater:./objdir-clone/linux-x64-water-heater-${BUILD_VARIANT}/matter-water-heater-app \
                   "
 
             - name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -404,6 +429,7 @@ jobs:
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
                      --include-tags PURPOSEFUL_FAILURE \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --expected-failures 3 \
@@ -426,6 +452,7 @@ jobs:
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
                      --target TestOperationalState \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
@@ -448,6 +475,7 @@ jobs:
                      --exclude-tags EXTRA_SLOW \
                      --exclude-tags SLOW \
                      --exclude-tags PURPOSEFUL_FAILURE \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
@@ -464,6 +492,7 @@ jobs:
                      --app-path network-manager:./objdir-clone/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
                      --app-path energy-gateway:./objdir-clone/linux-x64-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
                      --app-path evse:./objdir-clone/linux-x64-evse-${BUILD_VARIANT}/chip-evse-app \
+                     --app-path water-heater:./objdir-clone/linux-x64-water-heater-${BUILD_VARIANT}/matter-water-heater-app \
                   "
             - name: Run Tests using matter-repl (including slow)
               if: github.event_name == 'push'
@@ -473,6 +502,7 @@ jobs:
                      --find-path $PWD/objdir-clone \
                      --find-path $PWD/scripts \
                      --runner matter_repl_python \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
@@ -489,6 +519,7 @@ jobs:
                      --app-path network-manager:./objdir-clone/linux-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
                      --app-path energy-gateway:./objdir-clone/linux-x64-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
                      --app-path evse:./objdir-clone/linux-x64-evse-${BUILD_VARIANT}/chip-evse-app \
+                     --app-path water-heater:./objdir-clone/linux-x64-water-heater-${BUILD_VARIANT}/matter-water-heater-app \
                   "
             - name: Uploading core files
               uses: actions/upload-artifact@v6
@@ -603,6 +634,7 @@ jobs:
                         --target darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT} \
                         --target darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT} \
                         --target darwin-${{matrix.arch}}-evse-${BUILD_VARIANT} \
+                        --target darwin-${{matrix.arch}}-water-heater-${BUILD_VARIANT} \
                         --target darwin-${{matrix.arch}}-tv-app-${BUILD_VARIANT} \
                         --target darwin-${{matrix.arch}}-all-devices-${BUILD_VARIANT} \
                         --pw-command-launcher=ccache \
@@ -627,6 +659,7 @@ jobs:
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
                      --target-skip-glob '{Test_TC_DGTHREAD_2_1,Test_TC_DGTHREAD_2_2,Test_TC_DGTHREAD_2_3,Test_TC_DGTHREAD_2_4}' \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --test-timeout-seconds 120 \
@@ -644,6 +677,7 @@ jobs:
                      --app-path network-manager:./objdir-clone/darwin-${{matrix.arch}}-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
                      --app-path energy-gateway:./objdir-clone/darwin-${{matrix.arch}}-energy-gateway-${BUILD_VARIANT}/chip-energy-gateway-app \
                      --app-path evse:./objdir-clone/darwin-${{matrix.arch}}-evse-${BUILD_VARIANT}/chip-evse-app \
+                     --app-path water-heater:./objdir-clone/darwin-${{matrix.arch}}-water-heater-${BUILD_VARIANT}/matter-water-heater-app \
                   "
 
             - name: Run purposeful failure tests using the python parser sending commands to chip-tool
@@ -656,6 +690,7 @@ jobs:
                      --find-path $PWD/scripts \
                      --runner chip_tool_python \
                      --include-tags PURPOSEFUL_FAILURE \
+                     --test-order random \
                      run \
                      --iterations 1 \
                      --expected-failures 3 \
@@ -814,6 +849,13 @@ jobs:
                   --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
                   && rm -rf out/linux-x64-evse-${BUILD_VARIANT}-tsan-clang-test"
 
+            - name: Build linux-x64-water-heater
+              run: >-
+                  ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
+                  --target linux-x64-water-heater-${BUILD_VARIANT}-tsan-clang-test
+                  --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
+                  && rm -rf out/linux-x64-water-heater-${BUILD_VARIANT}-tsan-clang-test"
+
             - name: Build linux-x64-network-manager
               run: >-
                   ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
@@ -918,13 +960,6 @@ jobs:
             - name: ccache stats
               run: ccache -s
 
-            - name: Install push_av_server dependencies
-              run: >-
-                  ./scripts/run_in_python_env.sh out/venv \
-                  "python3 -m pip install -r src/tools/push_av_server/requirements.txt \
-                    && patch -d \$(python3 -m pip show hypercorn | grep 'Location: ' | sed 's/Location: //') -p0 < src/tools/push_av_server/hypercorn.patch \
-                  "
-
             # We archive ourselves since upload-artifact seems to lose permission bits
             # We also remove some debug info to make artifacts smaller (otherwise they are 2GB for binaries)
             - name: Archive artifacts
@@ -1046,6 +1081,7 @@ jobs:
                   echo "SU_OTA_REQUESTOR_V2: objdir-clone/chip-ota-requestor-app_v2.min.ota" >> /tmp/test_env.yaml
                   echo "TERMS_AND_CONDITIONS_APP: objdir-clone/linux-x64-terms-and-conditions/chip-terms-and-conditions-app" >> /tmp/test_env.yaml
                   echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
+                  echo "WATER_HEATER_APP: objdir-clone/linux-x64-water-heater-${BUILD_VARIANT}-tsan-clang-test/matter-water-heater-app" >> /tmp/test_env.yaml
                   echo "WATER_LEAK_DETECTOR_APP: objdir-clone/linux-x64-water-leak-detector-${BUILD_VARIANT}-tsan-clang-test-unified/water-leak-detector-app" >> /tmp/test_env.yaml
                   # keep-sorted: end
 

.gitignore

@@ -93,3 +93,6 @@ examples/*/esp32/dependencies.lock
 
 # Initial layout generated by imgui
 imgui.ini
+
+# Joint Fabric test harness output file
+admin_storage.json