From 961a8cf85e9fd8ddf4ff9435ddd334cfd193980a Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 22 Apr 2020 17:05:59 +0800
Subject: [PATCH] remove artifact config in ci.

---
 .gitlab-ci.yml                | 11 +++++------
 tools/ci/build_examples.sh    |  4 ++--
 tools/ci/config/build.yml     | 35 ++++++++++++-----------------------
 tools/find_build_apps/make.py | 10 +++++-----
 4 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 267ef246c..ce6fa981a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,6 @@ variables:
   # tell build system do not check submodule update as we download archive instead of clone
   IDF_SKIP_CHECK_SUBMODULES: 1
 
-  EXAMPLE_TEST_BUILD_SYSTEM: cmake
   IDF_PATH: "$CI_PROJECT_DIR"
   BATCH_BUILD: "1"
   V: "0"
@@ -137,11 +136,11 @@ before_script:
     - *fetch_submodules
 
 include:
-#  - '/tools/ci/config/pre_check.yml'
+  - '/tools/ci/config/pre_check.yml'
   - '/tools/ci/config/build.yml'
   - '/tools/ci/config/assign-test.yml'
-#  - '/tools/ci/config/host-test.yml'
+  - '/tools/ci/config/host-test.yml'
   - '/tools/ci/config/target-test.yml'
-#  - '/tools/ci/config/post_check.yml'
-#  - '/tools/ci/config/deploy.yml'
-#  - '/tools/ci/config/post_deploy.yml'
+  - '/tools/ci/config/post_check.yml'
+  - '/tools/ci/config/deploy.yml'
+  - '/tools/ci/config/post_deploy.yml'
diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh
index cd6e48142..7308861f7 100755
--- a/tools/ci/build_examples.sh
+++ b/tools/ci/build_examples.sh
@@ -30,7 +30,7 @@ die() {
 [ -z ${LOG_PATH} ] && die "LOG_PATH is not set"
 [ -z ${BUILD_PATH} ] && die "BUILD_PATH is not set"
 [ -z ${IDF_TARGET} ] && die "IDF_TARGET is not set"
-[ -z ${BUILD_SYSTEM} ] && die "BUILD_SYSTEM is not set"
+[ -z ${EXAMPLE_TEST_BUILD_SYSTEM} ] && die "EXAMPLE_TEST_BUILD_SYSTEM is not set"
 [ -d ${LOG_PATH} ] || mkdir -p ${LOG_PATH}
 [ -d ${BUILD_PATH} ] || mkdir -p ${BUILD_PATH}
 
@@ -74,7 +74,7 @@ cd ${IDF_PATH}
 ${IDF_PATH}/tools/find_apps.py examples \
     -vv \
     --format json \
-    --build-system ${BUILD_SYSTEM} \
+    --build-system ${EXAMPLE_TEST_BUILD_SYSTEM} \
     --target ${IDF_TARGET} \
     --recursive \
     --exclude examples/build_system/idf_as_lib \
diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index bcfd0c72e..7133ac2a4 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -1,4 +1,3 @@
-
 .build_template:
   stage: build
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
@@ -98,8 +97,7 @@ build_esp_idf_tests_cmake_esp32s2:
     - mkdir -p ${LOG_PATH}
     - ${IDF_PATH}/tools/ci/build_examples.sh
     # Check if the tests demand Make built binaries. If not, delete them
-    - if [ "$EXAMPLE_TEST_BUILD_SYSTEM" == ${BUILD_SYSTEM} ]; then exit 0; fi
-    - cd ..
+    - if [ ${EXAMPLE_TEST_BUILD_SYSTEM} == "cmake" ]; then exit 0; fi
     - rm -rf ${BUILD_PATH}
 
 build_examples_make:
@@ -109,30 +107,21 @@ build_examples_make:
   retry: 1
   artifacts:
     paths:
-      - build_examples_make/list.json
-      - build_examples_make/list_job_*.json
-      - build_examples_make/*/*/*/sdkconfig
-      - build_examples_make/*/*/*/build/*.bin
-      - build_examples_make/*/*/*/build/*.elf
-      - build_examples_make/*/*/*/build/*.map
-      - build_examples_make/*/*/*/build/download.config
-      - build_examples_make/*/*/*/build/bootloader/*.bin
-      - build_examples_make/*/*/*/*/build/partition_table/*.bin
       - $LOG_PATH
   variables:
     LOG_PATH: "${CI_PROJECT_DIR}/log_examples_make"
     BUILD_PATH: "${CI_PROJECT_DIR}/build_examples_make"
-    BUILD_SYSTEM: "make"
+    EXAMPLE_TEST_BUILD_SYSTEM: "make"
     IDF_TARGET: "esp32"  # currently we only support esp32
-#  only:
-#    refs:
-#      - master
-#      - /^release\/v/
-#      - /^v\d+\.\d+(\.\d+)?($|-)/
-#      - triggers
-#      - schedules
-#      - pipelines
-#      - web
+  only:
+    refs:
+      - master
+      - /^release\/v/
+      - /^v\d+\.\d+(\.\d+)?($|-)/
+      - triggers
+      - schedules
+      - pipelines
+      - web
 
 # same as above, but for CMake
 .build_examples_cmake: &build_examples_cmake
@@ -152,7 +141,7 @@ build_examples_make:
   variables:
     LOG_PATH: "${CI_PROJECT_DIR}/log_examples"
     BUILD_PATH: "${CI_PROJECT_DIR}/build_examples"
-    BUILD_SYSTEM: "cmake"
+    EXAMPLE_TEST_BUILD_SYSTEM: "cmake"
 
 build_examples_cmake_esp32:
   extends: .build_examples_cmake
diff --git a/tools/find_build_apps/make.py b/tools/find_build_apps/make.py
index 3f8ab5c19..239f15469 100644
--- a/tools/find_build_apps/make.py
+++ b/tools/find_build_apps/make.py
@@ -11,6 +11,11 @@ MAKE_PROJECT_LINE = r"include $(IDF_PATH)/make/project.mk"
 
 BUILD_SYSTEM_MAKE = "make"
 
+try:
+    string_type = basestring
+except NameError:
+    string_type = str
+
 
 class MakeBuildSystem(BuildSystem):
     NAME = BUILD_SYSTEM_MAKE
@@ -35,11 +40,6 @@ class MakeBuildSystem(BuildSystem):
             build_stderr = log_file
 
         for cmd in commands:
-            py3 = sys.version_info[0] == 3
-            if py3:
-                string_type = str
-            else:
-                string_type = basestring
             cmd = shlex.split(cmd) if isinstance(cmd, string_type) else cmd
             try:
                 subprocess.check_call(cmd, stdout=build_stdout, stderr=build_stderr, cwd=work_path)