From afcc276bd63a0311f5a1a79e95cb273199ba23b8 Mon Sep 17 00:00:00 2001
From: shripad621git <shripad62001@gmail.com>
Date: Thu, 7 Nov 2024 15:12:12 +0530
Subject: [PATCH 1/4] [v1.3] Updated the submodule to v1.3-branch to include
 insights version change

---
 .gitlab-ci.yml                  | 2 +-
 connectedhomeip/connectedhomeip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30df1b831..325cf224d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
     IDF_CHECKOUT_REF: "v5.2.1"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "82748b9f0e"
+    CHIP_SHORT_HASH: "735b69f73e"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |
diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip
index 82748b9f0..735b69f73 160000
--- a/connectedhomeip/connectedhomeip
+++ b/connectedhomeip/connectedhomeip
@@ -1 +1 @@
-Subproject commit 82748b9f0e5a4cdc4d10715f10c6160d49d87e75
+Subproject commit 735b69f73e386cb675242371afd0b237a8a78982

From 11a7f0545f8ab8eadd5be76ca1a432bf1c1d530a Mon Sep 17 00:00:00 2001
From: shripad621git <shripad62001@gmail.com>
Date: Thu, 7 Nov 2024 15:13:40 +0530
Subject: [PATCH 2/4] Revert the insights specific yaml changes

- Reverted the insights specific idf_component.yml changes
  for fixing the build failure due to insights component
  versions.
---
 components/esp_matter/idf_component.yml                | 10 ----------
 .../managed_component_light/main/idf_component.yml     |  8 +-------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 components/esp_matter/idf_component.yml

diff --git a/components/esp_matter/idf_component.yml b/components/esp_matter/idf_component.yml
deleted file mode 100644
index 5f9b880ff..000000000
--- a/components/esp_matter/idf_component.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-    # This matches the dependency of esp_insights
-    # TODO: CON-1374
-    espressif/esp_diag_data_store:
-        version: "1.0.1"
-        require: public
-        rules:
-            - if: "idf_version >=5.0"
-            - if: "target != esp32h2"
diff --git a/examples/managed_component_light/main/idf_component.yml b/examples/managed_component_light/main/idf_component.yml
index 2d3dd6994..45742edd1 100644
--- a/examples/managed_component_light/main/idf_component.yml
+++ b/examples/managed_component_light/main/idf_component.yml
@@ -8,11 +8,5 @@ dependencies:
     version: "^1.1.0"
   espressif/esp_matter:
     version: "^1.3.0"
-  # This matches the dependency of esp_insights
-  espressif/esp_diag_data_store:
-        version: "1.0.1"
-        require: public
-        rules:
-            - if: "idf_version >=5.0"
-            - if: "target != esp32h2"
+
 

From eb46ae6e4efeeb18c2f74fc51dd45983f5aeea4c Mon Sep 17 00:00:00 2001
From: Shubham Patil <shubham.patil@espressif.com>
Date: Thu, 24 Oct 2024 15:43:59 +0530
Subject: [PATCH 3/4] ci: remove the unnecessary submodule fetch to fix the
 pipeline

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 325cf224d..ec434f7cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,6 @@ variables:
   # fetch submodules
   - export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
   - pip install python-gitlab
-  - python tools/ci/ci_fetch_submodule.py
   - cd examples/openthread/ot_rcp
   - idf.py set-target esp32h2
   - idf.py build
@@ -85,7 +84,6 @@ variables:
   - export PYTHONPATH=${IDF_PATH}/tools/ci/python_packages/:${PYTHONPATH}
   - pip install python-gitlab
   - cd ${IDF_PATH}
-  - python tools/ci/ci_fetch_submodule.py
 
 .setup_matter: &setup_matter
    - cd ${ESP_MATTER_PATH}

From 94def04d1b3d2ce5038dd4434ad8dbba575d28e8 Mon Sep 17 00:00:00 2001
From: shripad621git <shripad62001@gmail.com>
Date: Mon, 11 Nov 2024 11:02:54 +0530
Subject: [PATCH 4/4] Fixed the managed_component_light build failure

---
 .../managed_component_light/main/idf_component.yml     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/managed_component_light/main/idf_component.yml b/examples/managed_component_light/main/idf_component.yml
index 45742edd1..037bc9a51 100644
--- a/examples/managed_component_light/main/idf_component.yml
+++ b/examples/managed_component_light/main/idf_component.yml
@@ -8,5 +8,11 @@ dependencies:
     version: "^1.1.0"
   espressif/esp_matter:
     version: "^1.3.0"
-
-
+  # This matches the dependency of esp_insights
+  espressif/esp_diag_data_store:
+    version: "1.0.1"
+    require: public
+    rules:
+      - if: "idf_version >=5.0"
+      - if: "target != esp32h2"
+