Merge branch 'master' into create_CADMIN_1_15_test

Author: j-ororke

.devcontainer/devcontainer.json

@@ -1,20 +1,26 @@
 {
     "name": "CHIP Ubuntu Development Environment",
     "runArgs": [
-        "--cap-add=SYS_PTRACE",
-        "--security-opt",
-        "seccomp=unconfined",
         "--network=host",
-        "--privileged",
-        "-v",
-        "/dev/bus/usb:/dev/bus/usb:ro",
         "--device-cgroup-rule=a 189:* rmw",
         "--add-host=host.docker.internal:host-gateway"
     ],
+    "privileged": true,
+    "capAdd": ["SYS_PTRACE"],
+    "securityOpt": ["seccomp=unconfined"],
     "mounts": [
-        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
+        {
+            "source": "/var/run/docker.sock",
+            "target": "/var/run/docker.sock",
+            "type": "bind"
+        },
+        {
+            "source": "/dev/bus/usb",
+            "target": "/dev/bus/usb",
+            "type": "bind"
+        }
     ],
-    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "containerEnv": {

.github/workflows/bloat_check.yaml

@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
 
         steps:
             - name: Checkout

.github/workflows/build.yaml

@@ -43,7 +43,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -81,14 +81,6 @@ jobs:
               run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Run Tests
               run: scripts/tests/gn_tests.sh
-            # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
-            # TODO https://github.com/project-chip/connectedhomeip/issues/1512
-            # - name: Run Code Coverage
-            #   if: ${{ contains('main', env.BUILD_TYPE) }}
-            #   run: scripts/tools/codecoverage.sh
-            # - name: Upload Code Coverage
-            #   if: ${{ contains('main', env.BUILD_TYPE) }}
-            #   run: bash <(curl -s https://codecov.io/bash)
             - name: Set up Build Without Detail Logging
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
             - name: Run Build Without Detail Logging
@@ -139,7 +131,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -308,7 +300,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -373,7 +365,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -488,16 +480,16 @@ jobs:
     build_linux_gcc_coverage:
         name: Build on Linux (coverage)
 
-        runs-on: ubuntu-latest
+        env:
+            TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
+
         if: github.actor != 'restyled-io[bot]'
+        runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
-            volumes:
-                - "/:/runner-root-volume"
-                - "/tmp/log_output:/tmp/test_logs"
+            image: ghcr.io/project-chip/chip-build:104
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
-                net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
+                net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
         steps:
             - name: Checkout
@@ -506,6 +498,8 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: linux
+                bootstrap-log-name: bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}                
 
             - name: Run Build Coverage
-              run: ./scripts/build_coverage.sh
+              run: ./scripts/build_coverage.sh --yaml
+

.github/workflows/check-data-model-directory-updates.yaml

@@ -36,4 +36,28 @@ jobs:
           python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.3
       - name: Check for changes to 1.4 data_model directory without a SHA update
         run: |
-          python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4
+          python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4
+      - name: Check for changes to 1.4.1 data_model directory without a SHA update
+        run: |
+          python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4.1
+
+  check-data_model-build-file:
+    name: Check that all data_model files are listed in the data_model_xmls.gni build file
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/project-chip/chip-build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup pip modules we use
+        run: |
+            python3 -m venv out/venv
+            out/venv/bin/pip3 install \
+                jinja2
+      - name: Generate build file (data_model_xmls.gni)
+        run: out/venv/bin/python3 src/python_testing/matter_testing_infrastructure/generate_data_model_xmls_gni.py
+      - name: Ensure git works in current working directory
+        run: git config --global --add safe.directory `pwd`
+      - name: Check for uncommited changes
+        run: |
+          git diff --exit-code HEAD -- src/python_testing/matter_testing_infrastructure/data_model_xmls.gni

.github/workflows/chef.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             options: --user root
 
         steps:
@@ -57,7 +57,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:97
+            image: ghcr.io/project-chip/chip-build-esp32:104
             options: --user root
 
         steps:
@@ -78,7 +78,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:97
+            image: ghcr.io/project-chip/chip-build-nrf-platform:104
             options: --user root
 
         steps:
@@ -99,7 +99,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:97
+            image: ghcr.io/project-chip/chip-build-telink:104
             options: --user root
 
         steps:
@@ -111,7 +111,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py c05c461b1119782cc839cf436fa04ec5e1fb2c8c"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/doxygen.yaml

@@ -84,7 +84,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:97
+            image: ghcr.io/project-chip/chip-build-doxygen:104
 
         if: github.actor != 'restyled-io[bot]'
 

.github/workflows/examples-ameba.yaml

@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:97
+            image: ghcr.io/project-chip/chip-build-ameba:104
             options: --user root
 
         steps:

.github/workflows/examples-asr.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-asr:97
+            image: ghcr.io/project-chip/chip-build-asr:104
             options: --user root
 
         steps:

.github/workflows/examples-bouffalolab.yaml

@@ -38,7 +38,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:97
+      image: ghcr.io/project-chip/chip-build-bouffalolab:104
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/examples-cc13xx_26xx.yaml

@@ -42,7 +42,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:97
+            image: ghcr.io/project-chip/chip-build-ti:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.github/workflows/examples-cc32xx.yaml

@@ -41,7 +41,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ti:97
+            image: ghcr.io/project-chip/chip-build-ti:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.github/workflows/examples-efr32.yaml

@@ -41,7 +41,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:95
+      image: ghcr.io/project-chip/chip-build-efr32:104
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/examples-esp32.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:97
+            image: ghcr.io/project-chip/chip-build-esp32:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -93,7 +93,7 @@ jobs:
                   mv scripts/codegen.py.renamed scripts/codegen.py
                   mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
             - name: Build example All Clusters App(Target:ESP32C3)
-              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults.esp32c3 esp32c3
+              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig.defaults esp32c3
             - name: Build example All Clusters App(Target:ESP32)
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -114,10 +114,10 @@ jobs:
                      /tmp/bloat_reports/
 
             - name: Build example Lighting App (Target:ESP32H2)
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2 esp32h2
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32h2
 
             - name: Build example Lighting App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32c6 esp32c6
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -132,7 +132,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]' &&  github.repository_owner == 'espressif'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:97
+            image: ghcr.io/project-chip/chip-build-esp32:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -163,7 +163,7 @@ jobs:
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
 
             - name: Build example Light Switch App (Target:ESP32C3)
-              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3 esp32c3
+              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults esp32c3
 
             - name: Build example Lighting App (external platform)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.ext_plat.defaults
@@ -178,4 +178,4 @@ jobs:
               run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
 
             - name: Build example Lock App (Target:ESP32C6)
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6 esp32c6
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults esp32c6

.github/workflows/examples-infineon.yaml

@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-infineon:97
+            image: ghcr.io/project-chip/chip-build-infineon:104
             env:
                # TODO: this should probably be part of the dockerfile itself
                CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

.github/workflows/examples-linux-arm.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:97
+            image: ghcr.io/project-chip/chip-build-crosscompile:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

.github/workflows/examples-linux-imx.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-imx:97
+            image: ghcr.io/project-chip/chip-build-imx:104
 
         steps:
             - name: Checkout

.github/workflows/examples-linux-standalone.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

.github/workflows/examples-linux-tv-casting-app.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
 
         steps:
             - name: Checkout

.github/workflows/examples-mw320.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:97
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.github/workflows/examples-nrfconnect.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:97
+            image: ghcr.io/project-chip/chip-build-nrf-platform:104
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -196,6 +196,8 @@ jobs:
             - 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'
               run: |
+                  # Temporarily fix link issue
+                  sed -i '151s/<LINK_FLAGS> //' /opt/NordicSemiconductor/nrfconnect/zephyr/cmake/linker/ld/target.cmake
                   scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
             - name: Uploading Failed Test Logs
               uses: actions/upload-artifact@v4