Merge branch 'master' into osirko-tc_tctl_2_3_python_test

project-chip · Dec 9, 2024 · 5777abd · 5777abd
2 parents cb1fdfc + af8d173
commit 5777abd
Show file tree

Hide file tree

Showing 324 changed files with 5,465 additions and 3,203 deletions.
diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -33,7 +33,7 @@ on:
               required: false
               type: boolean
               default: false
-  
+
 jobs:
     build_images_base:
         name: Build Docker CHIP Build images - base
@@ -102,6 +102,7 @@ jobs:
                     # - "-imx"
                     - "-java"
                     - "-nxp"
+                    - "-nxp-zephyr"
                     - "-nrf-platform"
                     - "-telink"
                     - "-ti"
@@ -120,7 +121,7 @@ jobs:
               run: |
                   cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
                   ./build.sh --latest
-                    
+
     build_images_stage_3:
         needs: [build_images_base, build_images_stage_1, build_images_stage_2]
         name: Build Docker CHIP Build images - stage 3

diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp:93
+            image: ghcr.io/project-chip/chip-build-nxp:94
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -240,7 +240,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp-zephyr:93
+            image: ghcr.io/project-chip/chip-build-nxp-zephyr:94
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
@@ -104,6 +104,8 @@ jobs:
                       build \
                    "
             - name: Run Discover Commissionables Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -115,6 +117,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -126,6 +130,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -137,6 +143,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Extendable Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -148,6 +156,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Read Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -159,6 +169,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Write Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -170,6 +182,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Subscribe Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -181,6 +195,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing AlreadyDiscovered Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -191,19 +207,22 @@ jobs:
                      --tool-args "already-discovered --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
                      --factoryreset \
                   '
-            # Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361
-            # - name: Run Pairing Address-PaseOnly Test
-            #   run: |
-            #      scripts/run_in_python_env.sh out/venv \
-            #       './scripts/tests/run_java_test.py \
-            #          --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
-            #          --app-args "--discriminator 3840 --interface-id -1" \
-            #          --tool-path out/linux-x64-java-matter-controller \
-            #          --tool-cluster "pairing" \
-            #          --tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
-            #          --factoryreset \
-            #       '
+            - name: Run Pairing Address-PaseOnly Test
+              # Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361
+              if: false
+              run: |
+                 scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "pairing" \
+                     --tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
+                     --factoryreset \
+                  '
             - name: Run Pairing SetupQRCode Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -215,6 +234,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing ManualCode Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -226,6 +247,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing ICD Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -236,7 +259,23 @@ jobs:
                      --tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
                   '
+            - name: Run Pairing Onnetwork and get diagnostic log Test
+              # TODO: test below is disabled because it seems flaky (crashes on pool not being empty on app exit)
+              #       See: https://github.com/project-chip/connectedhomeip/issues/36734
+              if: false
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "bdx" \
+                     --tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \
+                     --factoryreset \
+                  '
             - name: Run Pairing Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -248,6 +287,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -259,6 +300,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Read Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -270,6 +313,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Write Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -281,6 +326,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Subscribe Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -497,6 +497,7 @@ jobs:
                       --target linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test \
                       --target linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang \
                       --target linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang \
+                      --target linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang \
                       --target linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang \
                       --target linux-x64-python-bindings \
                       build \
@@ -514,6 +515,7 @@ jobs:
                   echo "NETWORK_MANAGEMENT_APP: out/linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test/matter-network-manager-app" >> /tmp/test_env.yaml
                   echo "FABRIC_ADMIN_APP: out/linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang/fabric-admin" >> /tmp/test_env.yaml
                   echo "FABRIC_BRIDGE_APP: out/linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang/fabric-bridge-app" >> /tmp/test_env.yaml
+                  echo "FABRIC_SYNC_APP: out/linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang/fabric-sync" >> /tmp/test_env.yaml
                   echo "LIGHTING_APP_NO_UNIQUE_ID: out/linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app" >> /tmp/test_env.yaml
                   echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
                   echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml

diff --git a/build/chip/chip_test_suite.gni b/build/chip/chip_test_suite.gni
@@ -93,6 +93,10 @@ template("chip_test_suite") {
     } else {
       public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
+
+    if (chip_device_platform == "esp32") {
+      complete_static_lib = true
+    }
   }
 
   # Build a source_set or a flashable executable for each individual unit test source, which also includes the common files.

diff --git a/build/chip/esp32/esp32_codegen.cmake b/build/chip/esp32/esp32_codegen.cmake
diff --git a/config/nxp/chip-module/Kconfig.defaults b/config/nxp/chip-module/Kconfig.defaults
@@ -252,6 +252,15 @@ choice SCHED_ALGORITHM
 	default SCHED_MULTIQ
 endchoice
 
+config WIFI_NM_MAX_MANAGED_INTERFACES
+	default 2
+
+config WIFI_NM_WPA_SUPPLICANT_WQ_PRIO
+	default 3
+
+config WIFI_NM_WPA_SUPPLICANT_PRIO
+	default 3
+
 choice WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_CHOICE
 	default WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_INF
 endchoice
@@ -320,6 +329,9 @@ config HEAP_MEM_POOL_SIZE
 config CHIP_MALLOC_SYS_HEAP_SIZE
 	default 28672 # 28 kB
 
+config ETH_DRIVER
+	default n
+
 endif
 
 if CHIP_ETHERNET || CHIP_WIFI
@@ -354,10 +366,10 @@ config MBEDTLS_USER_CONFIG_ENABLE
 config MBEDTLS_USER_CONFIG_FILE
     default "nxp-zephyr-mbedtls-config.h"
 
-config MBEDTLS_ENTROPY_ENABLED
+config MBEDTLS_ENTROPY_C
 	default y
 
-config MBEDTLS_ZEPHYR_ENTROPY
+config MBEDTLS_ENTROPY_POLL_ZEPHYR
 	default y
 
 config MBEDTLS_SSL_MAX_CONTENT_LEN

diff --git a/credentials/generate-revocation-set.py b/credentials/generate-revocation-set.py
@@ -32,6 +32,7 @@
 import requests
 from click_option_group import RequiredMutuallyExclusiveOptionGroup, optgroup
 from cryptography import x509
+from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.x509.oid import NameOID
 
@@ -510,12 +511,12 @@ def main(use_main_net_dcld: str, use_test_net_dcld: str, use_main_net_http: bool
             "issuer_subject_key_id": certificate_akid_hex,
             "issuer_name": certificate_authority_name_b64,
             "revoked_serial_numbers": serialnumber_list,
-            "crl_signer_cert": revocation_point["crlSignerCertificate"],
+            "crl_signer_cert": base64.b64encode(crl_signer_certificate.public_bytes(serialization.Encoding.DER)).decode('utf-8'),
         }
 
-        if "crlSignerDelegator" in revocation_point:
-            entry["crl_signer_delegator"] = revocation_point["crlSignerDelegator"]
-
+        if crl_signer_delegator_cert:
+            entry["crl_signer_delegator"] = base64.b64encode(
+                crl_signer_delegator_cert.public_bytes(serialization.Encoding.DER)).decode('utf-8'),
         logging.debug(f"Entry to append: {entry}")
         revocation_set.append(entry)