Просмотр исходного кода

test: add build ssc job for esp32s2beta

He Yin Ling 6 лет назад
Родитель
Сommit
bb442bd015
3 измененных файлов с 16 добавлено и 5 удалено
  1. 1 1
      tools/ci/config/assign-test.yml
  2. 14 3
      tools/ci/config/build.yml
  3. 1 1
      tools/ci/config/target-test.yml

+ 1 - 1
tools/ci/config/assign-test.yml

@@ -7,7 +7,7 @@ assign_test:
   # gitlab ci do not support match job with RegEx or wildcard now in dependencies.
   # gitlab ci do not support match job with RegEx or wildcard now in dependencies.
   # we have a lot build example jobs. now we don't use dependencies, just download all artificats of build stage.
   # we have a lot build example jobs. now we don't use dependencies, just download all artificats of build stage.
   dependencies:
   dependencies:
-    - build_ssc
+    - build_ssc_esp32
     - build_esp_idf_tests_cmake
     - build_esp_idf_tests_cmake
   variables:
   variables:
     SUBMODULES_TO_FETCH: "components/esptool_py/esptool"
     SUBMODULES_TO_FETCH: "components/esptool_py/esptool"

+ 14 - 3
tools/ci/config/build.yml

@@ -22,7 +22,7 @@
       - $BOT_LABEL_UNIT_TEST
       - $BOT_LABEL_UNIT_TEST
       - $BOT_LABEL_REGULAR_TEST
       - $BOT_LABEL_REGULAR_TEST
 
 
-build_ssc:
+.build_ssc_template:
   extends: .build_template
   extends: .build_template
   parallel: 3
   parallel: 3
   artifacts:
   artifacts:
@@ -30,7 +30,7 @@ build_ssc:
       - SSC/ssc_bin
       - SSC/ssc_bin
     expire_in: 1 week
     expire_in: 1 week
   variables:
   variables:
-    SSC_CONFIG_FOLDER: "$CI_PROJECT_DIR/SSC/configs/ESP32_IDF"
+    TARGET_NAME: "ESP32"
   only:
   only:
     variables:
     variables:
       - $BOT_TRIGGER_WITH_LABEL == null
       - $BOT_TRIGGER_WITH_LABEL == null
@@ -41,7 +41,18 @@ build_ssc:
     - git clone $SSC_REPOSITORY
     - git clone $SSC_REPOSITORY
     - python $CHECKOUT_REF_SCRIPT SSC SSC
     - python $CHECKOUT_REF_SCRIPT SSC SSC
     - cd SSC
     - cd SSC
-    - MAKEFLAGS= ./ci_build_ssc.sh
+    - MAKEFLAGS= ./ci_build_ssc.sh $TARGET_NAME
+
+build_ssc_esp32:
+  extends: .build_ssc_template
+  variables:
+    TARGET_NAME: "ESP32"
+
+build_ssc_esp32s2beta:
+  extends: .build_ssc_template
+  parallel: 2
+  variables:
+    TARGET_NAME: "ESP32S2"
 
 
 build_esp_idf_tests_make:
 build_esp_idf_tests_make:
   extends: .build_esp_idf_unit_test_template
   extends: .build_esp_idf_unit_test_template

+ 1 - 1
tools/ci/config/target-test.yml

@@ -123,7 +123,7 @@
       - $BOT_LABEL_INTEGRATION_TEST
       - $BOT_LABEL_INTEGRATION_TEST
   dependencies:
   dependencies:
     - assign_test
     - assign_test
-    - build_ssc
+    - build_ssc_esp32
   artifacts:
   artifacts:
     when: always
     when: always
     reports:
     reports: