Skip to content

Commit 6cead00

Browse files
committed
ci fix list of esp-idf versions and target test jobs
1 parent 21ae74e commit 6cead00

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

.gitlab-ci.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
# Define a matrix for IDF versions and their corresponding targets
1919
.options_list:
2020
# versions:
21-
# IDF_VER: ["latest", "v5.3", "v5.2", "v5.0"]
21+
# IDF_VER: ["latest", "v5.5", "v5.3", "v5.1"]
2222
analyzers:
2323
ANALYZER_TYPE: [gcc, clang]
2424
markers:
@@ -178,25 +178,25 @@ build_idf_latest:
178178
extends: .build_pytest_template
179179
image: espressif/idf:latest
180180
variables:
181-
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2"
181+
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c61 esp32c6 esp32h2 esp32p4"
182182

183-
build_idf_v5.3:
183+
build_idf_v5.5:
184184
extends: .build_pytest_template
185-
image: espressif/idf:release-v5.3
185+
image: espressif/idf:release-v5.5
186186
variables:
187-
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2"
187+
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4"
188188

189-
build_idf_v5.2:
189+
build_idf_v5.3:
190190
extends: .build_pytest_template
191-
image: espressif/idf:release-v5.2
191+
image: espressif/idf:release-v5.3
192192
variables:
193-
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
193+
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4"
194194

195-
build_idf_v5.0:
195+
build_idf_v5.1:
196196
extends: .build_pytest_template
197-
image: espressif/idf:release-v5.0
197+
image: espressif/idf:release-v5.1
198198
variables:
199-
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
199+
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2"
200200

201201
.target_test_template:
202202
stage: target_test
@@ -217,6 +217,7 @@ build_idf_v5.0:
217217
- pip install -r ${TEST_DIR}/tools/test_requirements.txt
218218
# Upgrade the packages (workaround for esp-idf v5.0)
219219
- pip install --only-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf --upgrade
220+
- ${IDF_PATH}/install.sh --enable-ci
220221

221222
.test_cur_folder: &test_cur_folder |
222223
export IDF_VER=$(cat ${TEST_DIR}/idf_version_info.txt)
@@ -257,7 +258,7 @@ build_idf_v5.0:
257258

258259
target_test_latest:
259260
stage: target_test
260-
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.4:1"
261+
image: "$CI_DOCKER_REGISTRY/target-test-env-v6.0:2"
261262
extends: .test_template
262263
parallel:
263264
matrix:
@@ -267,39 +268,39 @@ target_test_latest:
267268
artifacts: true
268269
after_script: []
269270

270-
target_test_v5.3:
271+
target_test_v5.5:
271272
stage: target_test
272-
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.3:1"
273+
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.5:2"
273274
extends: .test_template
274275
parallel:
275276
matrix:
276277
- !reference [.options_list, markers]
277278
needs:
278-
job: build_idf_v5.3
279+
job: build_idf_v5.5
279280
artifacts: true
280281
after_script: []
281282

282-
target_test_v5.2:
283+
target_test_v5.3:
283284
stage: target_test
284-
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.2:2"
285+
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.3:1"
285286
extends: .test_template
286287
parallel:
287288
matrix:
288289
- !reference [.options_list, markers]
289290
needs:
290-
job: build_idf_v5.2
291+
job: build_idf_v5.3
291292
artifacts: true
292293
after_script: []
293294

294-
target_test_v5.0:
295+
target_test_v5.1:
295296
stage: target_test
296-
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
297+
image: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1"
297298
extends: .test_template
298299
parallel:
299300
matrix:
300301
- !reference [.options_list, markers]
301302
needs:
302-
job: build_idf_v5.0
303+
job: build_idf_v5.1
303304
artifacts: true
304305
after_script: []
305306

0 commit comments

Comments
 (0)