Sync csa branch with main

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

@@ -80,6 +80,11 @@ jobs:
         run: |
           scripts/run_in_python_env.sh out/venv 'python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.6.1'
 
+      - name: Check for changes to the 1.7 data_model directory without a SHA update
+        if: (!contains(github.event.pull_request.labels.*.name, 'data-model-file-structural-change-dm-tt-use-only'))
+        run: |
+          scripts/run_in_python_env.sh out/venv 'python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.7'
+
   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

.github/workflows/tests.yaml

@@ -265,6 +265,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \

.mergify.yml

@@ -45,20 +45,20 @@ pull_request_rules:
     # Apply a request-backport-* label (such as request-backport-latest or
     # request-backport-supported) on the master PR (before or after merge)
     # to trigger the corresponding backport.
-    - name: Backport to v1.7-branch
-      conditions:
-          - merged
-          - base=master
-          - or:
-                - label="request-backport-latest-mve-sve"
-                - label="request-backport-latest"
-                - label="request-backport-supported"
-      actions:
-          backport:
-              branches:
-                  - v1.7-branch
-              labels:
-                  - backport-v1.7-branch
+    #  - name: Backport to v1.7-branch
+    #   conditions:
+    #       - merged
+    #       - base=master
+    #       - or:
+    #             - label="request-backport-latest-mve-sve"
+    #             - label="request-backport-latest"
+    #             - label="request-backport-supported"
+    #   actions:
+    #       backport:
+    #           branches:
+    #               - v1.7-branch
+    #           labels:
+    #               - backport-v1.7-branch
 
     - name: Backport to v1.6.1-branch
       conditions: