Merge remote-tracking branch 'upstream/master' into update_smco

.flake8

@@ -3,7 +3,6 @@ max-line-length = 132
 exclude = third_party
           .*
           out/*
-          scripts/idl/*
           ./examples/common/QRCode/*
           # temporarily scan only directories with fixed files
           # TODO: Remove the paths below when all bugs are fixed
@@ -15,26 +14,6 @@ exclude = third_party
           docs/_extensions/external_content.py
           examples/common/pigweed/rpc_console/py/chip_rpc/console.py
           examples/lighting-app/python/lighting.py
-          scripts/build/build/target.py
-          scripts/build/build/targets.py
-          scripts/build/builders/android.py
-          scripts/build/builders/bouffalolab.py
-          scripts/build/builders/cc13x2x7_26x2x7.py
-          scripts/build/builders/genio.py
-          scripts/build/builders/gn.py
-          scripts/build/builders/imx.py
-          scripts/build/builders/infineon.py
-          scripts/codegen.py
-          scripts/codepregen.py
-          scripts/error_table.py
-          scripts/examples/gn_to_cmakelists.py
-          scripts/flashing/bouffalolab_firmware_utils.py
-          scripts/flashing/cyw30739_firmware_utils.py
-          scripts/gen_chip_version.py
-          scripts/helpers/bloat_check.py
-          scripts/pregenerate/using_codegen.py
-          scripts/pregenerate/using_zap.py
-          scripts/run-clang-tidy-on-compile-commands.py
           scripts/tools/check_zcl_file_sync.py
           scripts/tools/convert_ini.py
           scripts/tools/memory/memdf/__init__.py
@@ -47,31 +26,6 @@ exclude = third_party
           scripts/tools/zap_convert_all.py
           src/app/ota_image_tool.py
           src/app/zap_cluster_list.py
-          src/controller/python/build-chip-wheel.py
-          src/controller/python/chip-device-ctrl.py
-          src/controller/python/chip/CertificateAuthority.py
-          src/controller/python/chip/ChipBleUtility.py
-          src/controller/python/chip/ChipBluezMgr.py
-          src/controller/python/chip/ChipCommissionableNodeCtrl.py
-          src/controller/python/chip/ChipCoreBluetoothMgr.py
-          src/controller/python/chip/ChipDeviceCtrl.py
-          src/controller/python/chip/ChipReplStartup.py
-          src/controller/python/chip/ChipStack.py
-          src/controller/python/chip/ChipUtility.py
-          src/controller/python/chip/FabricAdmin.py
-          src/controller/python/chip/ble/scan_devices.py
-          src/controller/python/chip/clusters/Attribute.py
-          src/controller/python/chip/clusters/ClusterObjects.py
-          src/controller/python/chip/clusters/Command.py
-          src/controller/python/chip/clusters/__init__.py
-          src/controller/python/chip/discovery/__init__.py
-          src/controller/python/chip/interaction_model/__init__.py
-          src/controller/python/chip/interaction_model/delegate.py
-          src/controller/python/chip/internal/commissioner.py
-          src/controller/python/chip/setup_payload/setup_payload.py
-          src/controller/python/chip/storage/__init__.py
-          src/controller/python/chip/tlv/__init__.py
-          src/controller/python/chip/utils/CommissioningBuildingBlocks.py
           src/controller/python/chip/yaml/__init__.py
           src/controller/python/chip/yaml/format_converter.py
           src/controller/python/chip/yaml/runner.py

.github/ISSUE_TEMPLATE/091-cert-blocker.yaml

@@ -1,12 +1,46 @@
-name: "\U0001F4DC Cert Blocker"
-description: Create a report to identify matter certification blockers
-title: "[CERT-BLOCKER] "
+name: "\U0001F4DC Test Case Failure / Cert Blocker"
+description: Create a report to identify matter certification test failures
+title: "[CERT-TEST-FAILURE] "
 labels: [bug, "cert blocker", "needs triage"]
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for reporting an issue against the Matter SDK! We need information about the cert blocker to follow up, so please help us out by filling out this information.
+  - type: dropdown
+    attributes:
+      label: Feature Area
+      description: What feature area is the test failing in?
+      multiple: true
+      options:
+        - Area:AirPurifiers
+        - Area:AirQualitySensor
+        - Area:ConcentrationMeasurement
+        - Area:DeviceAppearance
+        - Area:Dishwashers
+        - Area:DoorLockEnhancements
+        - Area:EventList
+        - Area:ICDPhase2
+        - Area:ModeSelect
+        - Area:OperationalState
+        - Area:Refrigerators
+        - Area:RobotVacuums
+        - Area:RoomAirConditioner
+        - Area:Scenes
+        - Area:SmokeCO2
+        - Area:TemperatureControlledCabinet
+        - Area:TimeSync
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: testcase
+    attributes:
+      label: Test Case
+      description: "Which test case is failing?"
+      placeholder: "TC-XXXX"
+    validations:
+      required: true
   - type: textarea
     id: repro
     attributes:
@@ -60,12 +94,6 @@ body:
         - core
     validations:
       required: true
-  - type: input
-    id: platform-versions
-    attributes:
-      label: Platform Version(s)
-      description: "What platform version(s) are affected [optional]"
-      placeholder: "eg: 1.2.1, N/A"
   - type: textarea
     attributes:
       label: Anything else?
@@ -77,4 +105,4 @@ body:
       required: false
   - type: markdown
     attributes:
-      value: "Thanks for submitting a cert blocker!"
+      value: "Thanks for submitting a test case/cert blocker!"

.github/ISSUE_TEMPLATE/097-ci-test-failure.yaml

@@ -0,0 +1,59 @@
+name: "\U0001F6E0 Test Issue"
+description: Test issue
+title: "[Test Failed] "
+labels: ["build issue", "needs triage", "tests"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue against the Matter SDK's tests! We need information about the bug report to follow up, so please help us out by filling out this information.
+  - type: textarea
+    id: repro
+    attributes:
+      label: Test issue(s)
+      description: "What are the tests that failed? Please include links to failed jobs if possible."
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Platform
+      description: What platforms are affected?
+      multiple: true
+      options:
+        - ameba
+        - android
+        - cc13x2_cc26x2
+        - darwin
+        - efr32
+        - esp32
+        - freeRTOS
+        - IMX8
+        - k32w
+        - nrf connect
+        - nrf
+        - python
+        - raspi
+        - vscode
+        - windows
+        - other
+        - core (please add to version below)
+        - all
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: "Thanks for helping improve our tests"

.github/actions/checkout-submodules/action.yaml

@@ -11,6 +11,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Checkout submodules
-      shell: bash
-      run: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform ${{ inputs.platform }} ${{ inputs.extra-parameters }}
+    - uses: Wandalen/wretry.action@v1.3.0
+      name: Checkout submodules
+      with:
+        command: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform ${{ inputs.platform }} ${{ inputs.extra-parameters }}
+        attempt_limit: 3
+        attempt_delay: 2000

.github/actions/perform-codeql-analysis/action.yaml

@@ -8,14 +8,12 @@ runs:
   using: "composite"
   steps:
     - name: Perform CodeQL Analysis
-      if: ${{ inputs.run-codeql  }}
       uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{ inputs.language }}"
         upload: False
         output: sarif-results
     - name: filter-sarif
-      if: ${{ inputs.run-codeql  }}
       uses: advanced-security/filter-sarif@v1
       with:
         patterns: |
@@ -25,12 +23,10 @@ runs:
         output: "sarif-results/${{ inputs.language }}.sarif"
 
     - name: Upload SARIF
-      if: ${{ inputs.run-codeql  }}
       uses: github/codeql-action/upload-sarif@v2
       with:
         sarif_file: "sarif-results/${{ inputs.language }}.sarif"
     - name: Upload loc as a Build Artifact
-      if: ${{ inputs.run-codeql  }}
       uses: actions/upload-artifact@v2.2.0
       with:
         name: sarif-results

.github/issue-labeler.yml

@@ -0,0 +1,43 @@
+darwin:
+  - "(ios|homepod|darwin|mac|macos)"
+
+linux:
+  - "(linux)"
+
+# Special Keywords for Cert Blockers
+air purifiers:
+  - "(Area:AirPurifiers)"
+air quality sensors:
+  - "(Area:AirQualitySensor)"
+concentration measurement:
+  - "(Area:ConcentrationMeasurement)"
+device appearance:
+  - "(Area:DeviceAppearance)"
+dishwashers:
+  - "(Area:Dishwashers)"
+door lock enhancements:
+  - "(Area:DoorLockEnhancements)"
+event list:
+  - "(Area;EventList)"
+icd:
+  - "(Area:ICDPhase2)"
+icd phase 2:
+  - "(Area:ICDPhase2)"
+mode select:
+  - "(Area:ModeSelect)"
+operational state:
+  - "(Area:OperationalState)"
+refrigerators:
+  - "(Area:Refrigerators)"
+robot vacuums:
+  - "(Area:RobotVacuums)"
+room air conditioners:
+  - "(Area:RoomAirConditioner)"
+scenes:
+  - "(Area:Scenes)"
+smoke & c02:
+  - "(Area:SmokeCO2)"
+temperature controlled cabinet:
+  - "(Area:TemperatureControlledCabinet)"
+time sync:
+  - "(Area:TimeSync)"

.github/workflows/cherry-picks.yaml

@@ -20,7 +20,7 @@ jobs:
             )
         steps:
             - name: Checkout
-              uses: actions/checkout@v3.5.2
+              uses: actions/checkout@v3
               with:
                   fetch-depth: 0
             - name: Cherry-Pick into sve branch

.github/workflows/darwin-tests.yaml

@@ -60,7 +60,7 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: darwin
-                bootstrap-log-name: bootstrap-logs-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                bootstrap-log-name: bootstrap-logs-darwin-${{ matrix.build_variant }}
 
             - name: Run macOS Darwin Framework Tool Build Debug
               working-directory: src/darwin/Framework
@@ -126,21 +126,27 @@ jobs:
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
               with:
-                  name: crash-core-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-core-darwin-${{ matrix.build_variant }}
                   path: /cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
             - name: Uploading diagnostic logs
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
               with:
-                  name: crash-log-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-log-darwin-${{ matrix.build_variant }}
                   path: ~/Library/Logs/DiagnosticReports/
+            - name: Uploading framework build log
+              uses: actions/upload-artifact@v3
+              if: ${{ failure() && !env.ACT }}
+              with:
+                  name: framework-build-log-darwin-${{ matrix.build_variant }}
+                  path: out/darwin-x64-darwin-framework-tool-${{ matrix.build_variant }}/darwin_framework_build.log
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
               with:
-                  name: crash-objdir-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
+                  name: crash-objdir-darwin-${{ matrix.build_variant }}
                   path: objdir-clone/
                   # objdirs are big; don't hold on to them too long.
                   retention-days: 5

.github/workflows/darwin.yaml

@@ -119,12 +119,15 @@ jobs:
                   # And a different port from the test harness too; the test harness uses port 5541.
                   ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5542 --discriminator 1111 --KVS /tmp/chip-ota-requestor-kvs1 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image1 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-1.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-1.log >&2) &
                   ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5543 --discriminator 1112 --KVS /tmp/chip-ota-requestor-kvs2 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image2 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-2.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-2.log >&2) &
+                  # Disable BLE because the app does not have the permission to use
+                  # it and that may crash the CI.
+                  #
                   # -enableUndefinedBehaviorSanitizer instruments the code in Matter.framework,
                   # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES > >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO > >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
                   # -enableThreadSanitizer instruments the code in Matter.framework,
                   # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_TSAN=YES
-                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableThreadSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_TSAN=YES > >(tee /tmp/darwin/framework-tests/darwin-tests-tsan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-tsan-err.log >&2)
+                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableThreadSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_TSAN=YES CHIP_IS_BLE=NO > >(tee /tmp/darwin/framework-tests/darwin-tests-tsan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-tsan-err.log >&2)
               working-directory: src/darwin/Framework
             - name: Build Matter TV Casting Bridge
               run: |

.github/workflows/docbuild.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3
         with:
           path: matter
           fetch-depth: 0

.github/workflows/doxygen.yaml

@@ -89,7 +89,7 @@ jobs:
             - name: "Print Actor"
               run: echo ${{github.actor}}
             - name: Checkout
-              uses: actions/checkout@v3.5.2
+              uses: actions/checkout@v3
             - name: Generate
               run: scripts/helpers/doxygen.sh
             - name: Extract branch name

.github/workflows/examples-efr32.yaml

@@ -38,7 +38,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-efr32:0.7.3
+      image: connectedhomeip/chip-build-efr32:0.7.25
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps: