Skip to content

Commit 595ddfd

Browse files
committed
Merge branch 'feature/build_ssc_in_multiple_ci_jobs' into 'master'
CI: support build SSC in multiple jobs See merge request idf/esp-idf!1622
2 parents d7c8866 + 48e3e3e commit 595ddfd

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

.gitlab-ci.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,29 @@ build_template_app:
111111
BATCH_BUILD: "1"
112112
V: "0"
113113

114-
build_ssc:
114+
.build_ssc_template: &build_ssc_template
115115
<<: *build_template
116116
artifacts:
117117
paths:
118118
- SSC/ssc_bin
119-
expire_in: 6 mos
119+
expire_in: 1 mos
120+
variables:
121+
SSC_CONFIG_FOLDER: "$CI_PROJECT_DIR/SSC/configs/ESP32_IDF"
120122
script:
121123
- git clone $SSC_REPOSITORY
122124
- cd SSC
123125
- python $CHECKOUT_REF_SCRIPT SSC
124-
- MAKEFLAGS= ./gen_misc_ng.sh
126+
- MAKEFLAGS= ./ci_build_ssc.sh "${CI_JOB_NAME}" "${IDF_PATH}/.gitlab-ci.yml"
127+
128+
# don't forget to add to dependency to test_template when adding new build_ssc jobs
129+
build_ssc_00:
130+
<<: *build_ssc_template
131+
132+
build_ssc_01:
133+
<<: *build_ssc_template
134+
135+
build_ssc_02:
136+
<<: *build_ssc_template
125137

126138
build_esp_idf_tests:
127139
<<: *build_template
@@ -472,7 +484,7 @@ assign_test:
472484
EXAMPLE_CONFIG_OUTPUT_PATH: "$CI_PROJECT_DIR/examples/test_configs"
473485
artifacts:
474486
paths:
475-
- test_bins
487+
- $OUTPUT_BIN_PATH
476488
- components/idf_test/*/CIConfigs
477489
- components/idf_test/*/TC.sqlite
478490
- $EXAMPLE_CONFIG_OUTPUT_PATH
@@ -492,7 +504,7 @@ assign_test:
492504
- cd auto_test_script
493505
- python $CHECKOUT_REF_SCRIPT auto_test_script
494506
# assgin integration test cases
495-
- python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/test_bins
507+
- python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/SSC/ssc_bin
496508

497509
.example_test_template: &example_test_template
498510
stage: test
@@ -544,6 +556,9 @@ assign_test:
544556
allow_failure: true
545557
dependencies:
546558
- assign_test
559+
- build_ssc_00
560+
- build_ssc_01
561+
- build_ssc_02
547562
artifacts:
548563
when: always
549564
paths:

components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BinPath:
2-
path: test_bins/ESP32_IDF/SSC_BLE
2+
path: SSC/ssc_bin/ESP32_IDF/SSC_BLE
33
test app: SSC_BLE
44

55
DUT: [SSC1]

0 commit comments

Comments
 (0)