From b17a53184108859cd363d943a87edd4a8c80c901 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 6 Dec 2021 13:33:10 +0800
Subject: [PATCH 1/3] ci: add EXAMPLE_WIFI_OTA job to run nightly run cases

---
 .gitlab/ci/target-test.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index a74b8ce75c..ba84e6e852 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -182,6 +182,13 @@ example_test_protocols:
     - ESP32
     - Example_WIFI_Protocols
 
+# This job is only triggered by env var `NIGHTLY_RUN`, please do NOT remove
+example_test_esp32_WIFI_OTA:
+  extends: .example_test_esp32_template
+  tags:
+    - ESP32
+    - Example_WIFI_OTA
+
 example_test_002:
   extends: .example_test_esp32_template
   image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG

From e47cf37c7983c1303593b0b72b62fde574086ac1 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 6 Dec 2021 13:35:54 +0800
Subject: [PATCH 2/3] ci: move check_submodule_sync to test_deploy stage

---
 .gitlab/ci/deploy.yml | 46 ++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index 1eb71d7f44..7ab97d92da 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -5,6 +5,30 @@
   tags:
     - deploy
 
+# Check this before push_to_github
+check_submodule_sync:
+  extends:
+    - .deploy_job_template
+    - .rules:test:submodule
+  stage: test_deploy
+  tags:
+    - github_sync
+  retry: 2
+  variables:
+    GIT_STRATEGY: clone
+    SUBMODULES_TO_FETCH: "none"
+    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
+  dependencies: []
+  script:
+    - git submodule deinit --force .
+    # setting the default remote URL to the public one, to resolve relative location URLs
+    - git config remote.origin.url ${PUBLIC_IDF_URL}
+    # check if all submodules are correctly synced to public repository
+    - git submodule init
+    - git config --get-regexp '^submodule\..*\.url$' || true
+    - git submodule update --recursive
+    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"
+
 push_to_github:
   extends:
     - .deploy_job_template
@@ -51,25 +75,3 @@ deploy_test_result:
     - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE}
     # update test results
     - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l CI -p ${CI_PROJECT_DIR}/TEST_LOGS --pipeline_url ${CI_PIPELINE_URL}
-
-check_submodule_sync:
-  extends:
-    - .deploy_job_template
-    - .rules:test:submodule
-  tags:
-    - github_sync
-  retry: 2
-  variables:
-    GIT_STRATEGY: clone
-    SUBMODULES_TO_FETCH: "none"
-    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
-  dependencies: []
-  script:
-    - git submodule deinit --force .
-    # setting the default remote URL to the public one, to resolve relative location URLs
-    - git config remote.origin.url ${PUBLIC_IDF_URL}
-    # check if all submodules are correctly synced to public repository
-    - git submodule init
-    - git config --get-regexp '^submodule\..*\.url$' || true
-    - git submodule update --recursive
-    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"

From ab953ad23809e14d3f8a90f4831a3ff4b6096928 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 6 Dec 2021 13:36:21 +0800
Subject: [PATCH 3/3] ci: fix redundant key `variables` under
 `.deploy_docs_template`

---
 .gitlab/ci/docs.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml
index 86275ab0e2..9fa33f2469 100644
--- a/.gitlab/ci/docs.yml
+++ b/.gitlab/ci/docs.yml
@@ -152,13 +152,12 @@ build_docs_pdf:
   image: $ESP_IDF_DOC_ENV_IMAGE
   variables:
     PYTHON_VER: 3.6.13
+    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
+    PYTHONUNBUFFERED: 1
   stage: test_deploy
   tags:
     - deploy
     - shiny
-  variables:
-    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
-    PYTHONUNBUFFERED: 1
   dependencies: []
   script:
     - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER