diff --git a/components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml b/components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml index 917efd7481..df791298d6 100644 --- a/components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml +++ b/components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml @@ -1,5 +1,5 @@ BinPath: - path: SSC/ssc_bin/ESP32_IDF/SSC_BLE_WIFI + path: SSC/ssc_bin/ESP32/SSC_BLE_WIFI test app: SSC_BLE_WIFI DUT: [SSC1] diff --git a/tools/ci/config/assign-test.yml b/tools/ci/config/assign-test.yml index e997062e36..5a7020b94c 100644 --- a/tools/ci/config/assign-test.yml +++ b/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. # we have a lot build example jobs. now we don't use dependencies, just download all artificats of build stage. dependencies: - - build_ssc + - build_ssc_esp32 - build_esp_idf_tests_cmake variables: SUBMODULES_TO_FETCH: "components/esptool_py/esptool" diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index a8e38a659b..cc98e4e3db 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -22,7 +22,7 @@ - $BOT_LABEL_UNIT_TEST - $BOT_LABEL_REGULAR_TEST -build_ssc: +.build_ssc_template: extends: .build_template parallel: 3 artifacts: @@ -30,7 +30,7 @@ build_ssc: - SSC/ssc_bin expire_in: 1 week variables: - SSC_CONFIG_FOLDER: "$CI_PROJECT_DIR/SSC/configs/ESP32_IDF" + TARGET_NAME: "ESP32" only: variables: - $BOT_TRIGGER_WITH_LABEL == null @@ -41,7 +41,18 @@ build_ssc: - git clone $SSC_REPOSITORY - python $CHECKOUT_REF_SCRIPT SSC 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: extends: .build_esp_idf_unit_test_template diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 586079b4fc..335c58bb77 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -123,7 +123,7 @@ - $BOT_LABEL_INTEGRATION_TEST dependencies: - assign_test - - build_ssc + - build_ssc_esp32 artifacts: when: always reports: