Merge branch 'master' into create_CADMIN_1_5_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/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,19 @@
-> !!!!!!!!!! Please delete the instructions below and replace with PR description
+
+#### Testing
+
+> !!!!!!!!!! Please delete the instructions below and replace with PR
+> description above.
 >
-> If you have an issue number, please use a syntax of
-> `Fixes #12345` and a brief change description
+> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
+> change description
 >
-> If you do not have an issue number, please have a good description of
-> the problem and the fix. Help the reviewer understand what to expect.
+> If you do not have an issue number, please have a good description of the
+> problem and the fix. Help the reviewer understand what to expect.
+>
+> Complete/append to the `### Testing` section above, to describe how testing
+> was done. See
+> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
 >
 > Make sure you delete these instructions (to prove you have read them).
 >
 > !!!!!!!!!! Instructions end
-

.github/labeler.yml

@@ -119,15 +119,6 @@ test driver:
       - src/test_driver/*
       - src/test_driver/**/*
 
-# Cert tests touched: add current milestone delta-tracking label.
-# TODO: Change after Aug 15, 2024
-matter-1.4-te2-script-change:
-  - changed-files:
-    - any-glob-to-any-file:
-      - src/python_testing/*
-      - src/python_testing/**/*
-      - src/app/tests/suites/certification/*
-
 ############################################################
 #  Source Code
 ############################################################

.github/workflows/bloat_check.yaml

@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:94
+            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:94
+            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:94
+            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:94
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -363,6 +355,8 @@ jobs:
                   python -m ensurepip --upgrade
                   python -m pip install -r scripts/setup/requirements.setuppayload.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
+            - name: Run revocation set generation tests
+              run: scripts/run_in_build_env.sh 'python3 -m unittest -v credentials/generate_revocation_set.py'
 
     build_linux_python_lighting_device:
         name: Build on Linux (python lighting-app)
@@ -371,7 +365,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:94
+            image: ghcr.io/project-chip/chip-build:104
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"
@@ -486,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:94
-            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
@@ -504,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/cancel_workflows_for_pr.yaml

@@ -35,15 +35,16 @@ jobs:
                 python-version: '3.12'
             - name: Setup pip modules we use
               run: |
-                  pip install         \
+                  python3 -m venv venv
+                  venv/bin/pip3 install \
                       click           \
                       coloredlogs     \
                       python-dateutil \
                       pygithub        \
-                      && echo "DONE installint python prerequisites"
+                      && echo "DONE installing python prerequisites"
             - name: Cancel runs
               run: |
-                  scripts/tools/cancel_workflows_for_pr.py       \
+                  venv/bin/python3 scripts/tools/cancel_workflows_for_pr.py \
                     --gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
                     --require "Restyled"       \
                     --require "Lint Code Base" \

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

@@ -12,20 +12,52 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Check for changes to data_model directory without a sha update 
+name: Data model directory checks
 
 on:
   pull_request:
-    paths:
-      - "data_model/**"
 
 jobs:
-  check-submodule-update-label:
-    name: Check for changes to data_model directory without a sha update
+  check-data_model-updates:
+    name: Check for updates to data model directory without SHA updates
     runs-on: ubuntu-latest
-    if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
+    container:
+      image: ghcr.io/project-chip/chip-build
     steps:
-      - name: Error Message
-        run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
-      - name: Fail Job
-        run: exit 1
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Check for changes to master data_model directory without a SHA update
+        run: |
+          python3 scripts/dm_xml_ci_change_enforcement.py data_model/master
+      - name: Check for changes to 1.3 data_model directory without a SHA update
+        run: |
+          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
+      - 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:94
+            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:94
+            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:94
+            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:94
+            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 ffdbfe7560c0b628e03ab487ab110eeed9bdc8c7"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/darwin.yaml

@@ -117,9 +117,18 @@ jobs:
                   export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
 
                   # Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
-                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx ${{ matrix.options.arguments }} \
+                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
+                    -resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
+                    -sdk macosx ${{ matrix.options.arguments }} \
                     CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
                     > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
+            - name: Generate Summary
+              if: always()
+              working-directory: /tmp
+              run: |
+                  wget https://github.com/a7ex/xcresultparser/releases/download/1.8.4/xcresultparser.zip
+                  unzip -j xcresultparser.zip
+                  ./xcresultparser --output-format md --failed-tests-only /tmp/darwin/framework-tests/TestResults.xcresult >>"$GITHUB_STEP_SUMMARY"
             - name: Collect crash logs
               if: failure() && !env.ACT
               run: |

.github/workflows/docbuild.yaml

@@ -29,17 +29,18 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
           cache-dependency-path: matter/docs/requirements.txt
           cache: pip
       - name: Install base dependencies
         working-directory: matter
         run: |
-          sudo pip3 install -U pip
-          pip3 install -r docs/requirements.txt
+          python3 -m venv venv
+          venv/bin/pip3 install -r docs/requirements.txt
       - name: Build documentation
         working-directory: matter/docs
         run: |
+          source ../venv/bin/activate
           mkdir -p _build/src
           make html
           touch _build/html/.nojekyll

.github/workflows/doxygen.yaml

@@ -84,7 +84,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:94
+            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:94
+            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:94
+            image: ghcr.io/project-chip/chip-build-asr:104
             options: --user root
 
         steps: