Merge branch 'master' into TC-SC-4.1-automation-latest

Author: raul-marquez-csa

.github/workflows/chef.yaml

@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:172
+            image: ghcr.io/project-chip/chip-build-esp32:174
             options: --user root
 
         steps:
@@ -106,6 +106,16 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: esp32
+
+            # We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
+            # will break the nuttx workflow which requires the older version of
+            # the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
+            # so, install it in in the virtual environment here
+            - name: Install esp-idf-kconfig
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "pip install esp-idf-kconfig==2.5.0"
+
             - name: CI Examples ESP32
               shell: bash
               run: |

.github/workflows/examples-esp32.yaml

@@ -55,8 +55,10 @@ jobs:
               with:
                 gh-context: ${{ toJson(github) }}
 
-            # Install esp-idf-kconfig==2.5.0 in the virtual environment here
-            # so it will not affect other workflows
+            # We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
+            # will break the nuttx workflow which requires the older version of
+            # the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
+            # so, install it in in the virtual environment here
             - name: Install esp-idf-kconfig
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -79,6 +81,9 @@ jobs:
                      out/esp32-c3devkit-all-clusters/chip-all-clusters-app.elf \
                      /tmp/bloat_reports/
 
+            - name: Remove built artifacts for all-clusters
+              run: rm -rf out/esp32-c3devkit-all-clusters
+
             - name: Prepare code pregen and ensure compile time pregen not possible
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/codepregen.py ./zzz_pregenerated"
@@ -104,6 +109,9 @@ jobs:
                   mv scripts/codegen.py.renamed scripts/codegen.py
                   mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
 
+            - name: Remove built artifacts for all-clusters-minimal
+              run: rm -rf out/esp32-m5stack-all-clusters-minimal
+
             - name: Check for changed paths
               uses: dorny/paths-filter@v3
               id: changed_paths
@@ -139,6 +147,9 @@ jobs:
                         --copy-artifacts-to out/artifacts \
                      "
 
+            - name: Remove built artifacts for all-clusters-rpc-ipv6only
+              run: rm -rf out/esp32-devkitc-all-clusters-rpc-ipv6only
+
             - name: Build example Lighting App (Target:ESP32C6)
               run: scripts/examples/esp_example.sh lighting-app sdkconfig.wifi_thread.defaults esp32c6
 

.github/workflows/tests.yaml

@@ -795,6 +795,35 @@ jobs:
             - name: ccache stats
               run: ccache -s
 
+            - name: Build linux-x64-requestor-app
+              env:
+                  CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
+              run: >-
+                  ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
+                  --target linux-x64-ota-requestor-${BUILD_VARIANT}-tsan-clang-test
+                  --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
+                  && rm -rf out/linux-x64-ota-requestor-${BUILD_VARIANT}-tsan-clang-test"
+
+            - name: Build linux-x64-provider-app
+              env:
+                  CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
+              run: >-
+                  ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py
+                  --target linux-x64-ota-provider-${BUILD_VARIANT}-tsan-clang-test
+                  --pw-command-launcher=ccache build --copy-artifacts-to objdir-clone
+                  && rm -rf out/linux-x64-ota-provider-${BUILD_VARIANT}-tsan-clang-test"
+
+            - name: Build Software Update ota images with new version.
+              env:
+                  CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
+              run: >- 
+                  ./scripts/run_in_build_env.sh "./scripts/build/build_ota_images.sh --out-prefix out/su_ota_images_min --max-range 2
+                  && mv out/su_ota_images_min-v*/*.ota objdir-clone
+                  && rm -rf out/su_ota_images_min-v*"
+
+            - name: ccache stats
+              run: ccache -s
+
             - name: Install push_av_server dependencies
               run: >-
                   ./scripts/run_in_python_env.sh out/venv \
@@ -822,19 +851,25 @@ jobs:
                   echo "FABRIC_SYNC_APP: objdir-clone/linux-x64-fabric-sync-${BUILD_VARIANT}-clang/fabric-sync" >> /tmp/test_env.yaml
                   echo "LIGHTING_APP_NO_UNIQUE_ID: objdir-clone/linux-x64-light-data-model-no-unique-id-${BUILD_VARIANT}-clang/chip-lighting-app" >> /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 "OTA_PROVIDER_APP: objdir-clone/linux-x64-ota-provider-${BUILD_VARIANT}-tsan-clang-test/chip-ota-provider-app" >> /tmp/test_env.yaml
+                  echo "OTA_REQUESTOR_APP: objdir-clone/linux-x64-ota-requestor-${BUILD_VARIANT}-tsan-clang-test/chip-ota-requestor-app" >> /tmp/test_env.yaml
                   echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
                   echo "JF_CONTROL_APP: objdir-clone/linux-x64-jf-control-app/jfc-app" >> /tmp/test_env.yaml
                   echo "JF_ADMIN_APP: objdir-clone/linux-x64-jf-admin-app/jfa-app" >> /tmp/test_env.yaml
                   echo "CLOSURE_APP: objdir-clone/linux-x64-closure-${BUILD_VARIANT}-tsan-clang-test-unified/closure-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
                   echo "PUSH_AV_SERVER: src/tools/push_av_server/server.py" >> /tmp/test_env.yaml
 
+                  # SU OTA Images
+                  echo "SU_OTA_REQUESTOR_V2: objdir-clone/chip-ota-requestor-app_v2.min.ota" >> /tmp/test_env.yaml
+
                   # Generic trace setups after applications
                   echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
                   echo "TRACE_TEST_PERFETTO: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
 
             - name: Verify Testing Support
               run: |
+                  scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_ota_images_versions.py -i objdir-clone/chip-ota-requestor-app_v2.min.ota -v 2' 
                   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_ICDM_2_1_full_pics.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/test_TC_ICDM_2_1_min_pics.py'
@@ -853,7 +888,6 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestSpecParsingSelection.py'
                   scripts/run_in_python_env.sh out/venv 'python3 src/python_testing/test_testing/TestSpecParsingSupport.py'
                   scripts/run_in_python_env.sh out/venv 'PYTHONPATH=src/python_testing:$PYTHONPATH python3 -m unittest discover -s src/python_testing/mdns_discovery/tests -p "test_*.py"'
-
             - name: Run Tests
               run: |
                   mkdir -p out/trace_data

.restyled.yaml

@@ -224,21 +224,12 @@ restylers:
           - "**/*.sh"
           - "**/*.bash"
     - name: autopep8
-      image: restyled/restyler-autopep8:v2.3.1
-      command:
-          - autopep8
-          - "--in-place"
-      arguments: []
-      include:
-          - "**/*.py"
-      interpreters:
-          - python
+      image: public.ecr.aws/restyled-io/restyler-autopep8:v2.3
     - name: isort
-      image: restyled/restyler-isort:v5.11.2
+      image: public.ecr.aws/restyled-io/restyler-isort:v7.0
+    - name: ruff
+      image: public.ecr.aws/restyled-io/restyler-ruff:v0.14
       command:
-          - isort
-      arguments: []
-      include:
-          - "**/*.py"
-      interpreters:
-          - python
+          - ruff
+          - check
+          - --fix-only

build/chip/chip_test_suite.gni

@@ -95,6 +95,7 @@ template("chip_test_suite") {
     } else {
       public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
+    public_deps += [ "${chip_root}/src/lib/support/tests:pw-test-macros" ]
 
     if (chip_device_platform == "esp32") {
       complete_static_lib = true

config/common/cmake/make_gn_args.py

@@ -56,12 +56,12 @@ def write_gn_args(args):
         filtered_value = filter(lambda v: v != "D", filtered_value)
         filtered_value = filter(lambda v: v != "isystem", filtered_value)
         # Escaped quote and dollar sign characters
-        filtered_value = map(lambda v: v.replace('"', '\\"'), filtered_value)
-        filtered_value = map(lambda v: v.replace('$', '\\$'), filtered_value)
+        filtered_value = (v.replace('"', '\\"') for v in filtered_value)
+        filtered_value = (v.replace('$', '\\$') for v in filtered_value)
         # Remove white spaces around the argument and remove internal whitespace
         # for correct splitting in string_split() function
-        filtered_value = map(lambda v: v.strip(), filtered_value)
-        filtered_value = map(lambda v: v.replace(' ', ''), filtered_value)
+        filtered_value = (v.strip() for v in filtered_value)
+        filtered_value = (v.replace(' ', '') for v in filtered_value)
         #  Remove duplicates
         filtered_value = list(dict.fromkeys(filtered_value))
 

config/esp32/components/chip/create_args_gn.py

@@ -44,11 +44,13 @@
     compile_commands = json.load(compile_commands_json)
 
     def get_compile_flags(src_file):
-        compile_command = list(map(lambda res: res["command"],
-                               filter(lambda cmd: cmd["file"] == src_file, compile_commands)))
+        compile_command = [
+            res["command"]
+            for res in filter(lambda cmd: cmd["file"] == src_file, compile_commands)
+        ]
 
         if len(compile_command) != 1:
-            raise Exception("Failed to resolve compile flags for %s", src_file)
+            raise Exception(f"Failed to resolve compile flags for {src_file}")
 
         compile_command = compile_command[0]
         # Trim compiler, input and output
@@ -57,12 +59,10 @@ def get_compile_flags(src_file):
         replace = "-I%s" % args.idf_path
         replace_with = "-isystem%s" % args.idf_path
 
-        compile_flags = list(map(lambda f: ('"%s"' % f).replace(
-            replace, replace_with), compile_flags))
+        compile_flags = [f'"{f}"'.replace(replace, replace_with) for f in compile_flags]
 
         if args.filter_out:
-            filter_out = list(map(lambda f: ('"%s"' % f),
-                              args.filter_out.split(';')))
+            filter_out = [f'"{f}"' for f in args.filter_out.split(';')]
             compile_flags = [c for c in compile_flags if c not in filter_out]
 
         return compile_flags

config/nxp/cmake/Kconfig.matter.common

@@ -400,6 +400,13 @@ config CHIP_ICD_UAT_SUPPORT
 	  Enables the User Active Mode Trigger (UAT) support in Matter. It allows the User to use application specific
 	  means (e.g. button press) to trigger an ICD device to enter the active mode and become responsive.
 
+config CHIP_ICD_DSLS_SUPPORT
+	bool "Intermittently Connected Device Dynamic SIT LIT support"
+	depends on CHIP_ICD_LIT_SUPPORT
+	help
+	  Enables the Dynamic SIT LIT support in Matter. It allows the application to dynamically switch between
+	  SIT and LIT modes, as long as the requirements for these modes are met (e.g. device has at least one active ICD client).
+
 config CHIP_ICD_CLIENTS_PER_FABRIC
 	int "Intermittently Connected Device number of clients per fabric"
 	default 2

config/nxp/cmake/common.cmake

@@ -49,6 +49,7 @@ matter_add_gn_arg_bool("chip_enable_ethernet" CONFIG_CHIP_ETHERNET)
 matter_add_gn_arg_bool("chip_system_config_provide_statistics" CONFIG_CHIP_STATISTICS)
 matter_add_gn_arg_bool("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
 matter_add_gn_arg_bool("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
+matter_add_gn_arg_bool("chip_enable_icd_dsls" CONFIG_CHIP_ICD_DSLS_SUPPORT)
 matter_add_gn_arg_bool("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool("chip_system_config_use_openthread_inet_endpoints" CONFIG_CHIP_USE_OT_ENDPOINT)