From e6fb88179540ad269f2086843ca037ffc26c5a52 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 19 Aug 2022 09:10:12 -0400
Subject: [PATCH] Add a recursive submodule checkout for cloudbuild builds
 (#22015)

* Add a recursive submodule checkout for cloudbuild builds

* Restyle
---
 integrations/cloudbuild/build-all.yaml  | 9 +++++++++
 integrations/cloudbuild/smoke-test.yaml | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index 3326bb4ac1ce16..c8c09ad722319f 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -1,4 +1,11 @@
 steps:
+    - name: gcr.io/cloud-builders/git
+      args:
+          - submodule
+          - update
+          - "--init"
+          - "--recursive"
+      id: Submodules
     - name: "connectedhomeip/chip-build-vscode:0.5.91"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -6,6 +13,8 @@ steps:
           - "-c"
           - source ./scripts/bootstrap.sh
       id: Bootstrap
+      waitFor:
+          - Submodules
       entrypoint: /usr/bin/bash
       volumes:
           - name: pwenv
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 72dc9aa5678706..b0333fab36f327 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,4 +1,11 @@
 steps:
+    - name: gcr.io/cloud-builders/git
+      args:
+          - submodule
+          - update
+          - "--init"
+          - "--recursive"
+      id: Submodules
     - name: "connectedhomeip/chip-build-vscode:0.5.91"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -6,6 +13,8 @@ steps:
           - "-c"
           - source ./scripts/bootstrap.sh
       id: Bootstrap
+      waitFor:
+          - Submodules
       entrypoint: /usr/bin/bash
       volumes:
           - name: pwenv