From 7cb2e2fd1e8dd5e7da03f27d35c4fe232030eded Mon Sep 17 00:00:00 2001
From: Shubham Patil <shubham.patil@espressif.com>
Date: Mon, 10 Jan 2022 19:05:37 +0530
Subject: [PATCH] [ESP32] Add ESP32 OTA provider and requestor app to CI builds
 (#13212)

* Add ESP32 OTA provider and requestor app to CI builds

* Rename ESP32 OTA requestor project

* Increase the timeout to 95 minutes

* Split examples-esp32 workflow in two jobs
---
 .github/workflows/examples-esp32.yaml         | 59 ++++++++++++++++---
 .../ota-requestor-app/esp32/CMakeLists.txt    |  2 +-
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index decbb6af143bb3..00d86f2cdb7aca 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -26,7 +26,7 @@ jobs:
     # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
     esp32:
         name: ESP32
-        timeout-minutes: 105
+        timeout-minutes: 70
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -49,7 +49,7 @@ jobs:
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
 
             - name: Bootstrap
-              timeout-minutes: 25
+              timeout-minutes: 10
               run: scripts/build/gn_bootstrap.sh
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
@@ -99,22 +99,65 @@ jobs:
             - name: Build example Bridge App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh bridge-app
+
+            - name: Uploading Size Reports
+              uses: actions/upload-artifact@v2
+              if: ${{ !env.ACT }}
+              with:
+                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
+                  path: /tmp/bloat_reports/
+
+    esp32_1:
+        name: ESP32_1
+        timeout-minutes: 60
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-esp32:0.5.40
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
+
+            - name: Uploading bootstrap logs
+              uses: actions/upload-artifact@v2
+              if: ${{ always() }} && ${{ !env.ACT }}
+              with:
+                  name: bootstrap-logs
+                  path: |
+                   .environment/gn_out/.ninja_log
+                   .environment/pigweed-venv/*.log
+
             - name: Build example Persistent Storage App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
+
             - name: Build example Shell App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh shell sdkconfig.defaults
+
             - name: Build example Temperature Measurement App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh temperature-measurement-app sdkconfig.optimize.defaults
+
             - name: Build example IPv6 Only App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh ipv6only-app sdkconfig.defaults
 
-            - name: Uploading Size Reports
-              uses: actions/upload-artifact@v2
-              if: ${{ !env.ACT }}
-              with:
-                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
-                  path: /tmp/bloat_reports/
+            - name: Build example OTA Requestor App
+              run: scripts/examples/esp_example.sh ota-requestor-app sdkconfig.defaults
+              timeout-minutes: 10
+
+            - name: Build example OTA Provider App
+              run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
+              timeout-minutes: 10
diff --git a/examples/ota-requestor-app/esp32/CMakeLists.txt b/examples/ota-requestor-app/esp32/CMakeLists.txt
index 2e98c02cef57b8..03408d904ae03a 100644
--- a/examples/ota-requestor-app/esp32/CMakeLists.txt
+++ b/examples/ota-requestor-app/esp32/CMakeLists.txt
@@ -26,7 +26,7 @@ set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
 )
 
-project(chip-ota-requester-app)
+project(chip-ota-requestor-app)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)