Skip to content

Commit a74daed

Browse files
committed
CI: run all the pytest example builds with the same IDF version
1 parent c34a940 commit a74daed

File tree

1 file changed

+36
-14
lines changed

1 file changed

+36
-14
lines changed

.gitlab-ci.yml

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ build_image:
286286
REPOS_PATH: "$CI_PROJECT_DIR/repos"
287287
IDF_CCACHE_ENABLE: 1
288288

289-
build_esp_matter_examples_pytest_C6_idf_v5_1:
289+
build_esp_matter_examples_pytest_C6:
290290
extends:
291291
- .build_examples_template
292292
artifacts:
@@ -306,7 +306,7 @@ build_esp_matter_examples_pytest_C6_idf_v5_1:
306306
- pip install -r tools/ci/requirements-build.txt
307307
- python tools/ci/build_apps.py ./examples --pytest_c6
308308

309-
build_esp_matter_examples_pytest_H2_idf_v5_1:
309+
build_esp_matter_examples_pytest_H2:
310310
extends:
311311
- .build_examples_template
312312
artifacts:
@@ -340,10 +340,10 @@ build_esp_matter_examples_pytest_H2_idf_v5_1:
340340
- python tools/ci/build_apps.py ./examples --pytest_h2
341341
- |
342342
if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
343-
python tools/ci/memory_analyzer.py --chip esp32h2 --job_name "build_esp_matter_examples_pytest_H2_idf_v5_1" --ref_map_file light_mr_base.map --example "light"
343+
python tools/ci/memory_analyzer.py --chip esp32h2 --job_name "build_esp_matter_examples_pytest_H2" --ref_map_file light_mr_base.map --example "light"
344344
fi
345345
346-
build_esp_matter_examples_pytest_C2_idf_v5_1:
346+
build_esp_matter_examples_pytest_C2:
347347
extends:
348348
- .build_examples_template
349349
artifacts:
@@ -367,7 +367,7 @@ build_esp_matter_examples_pytest_C2_idf_v5_1:
367367
- python tools/ci/build_apps.py ./examples --pytest_c2
368368
- |
369369
if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
370-
python tools/ci/memory_analyzer.py --chip esp32c2 --job_name "build_esp_matter_examples_pytest_C2_idf_v5_1" --ref_map_file light_mr_base.map --example "light"
370+
python tools/ci/memory_analyzer.py --chip esp32c2 --job_name "build_esp_matter_examples_pytest_C2" --ref_map_file light_mr_base.map --example "light"
371371
fi
372372
373373
@@ -460,7 +460,7 @@ build_nopytest_remaining_examples_manual:
460460
parallel: 2
461461

462462

463-
build_esp_matter_examples_pytest_C3_idf_v4_4:
463+
build_esp_matter_examples_idf_v4_4:
464464
extends:
465465
- .build_examples_template
466466
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
@@ -480,42 +480,64 @@ build_esp_matter_examples_pytest_C3_idf_v4_4:
480480
- cd ${ESP_MATTER_PATH}
481481
# idf v4.4 requires jinja < 3.1 so lets install the dependencies for idf v4.4
482482
- pip install -r requirements_idf_v4.4.txt
483-
- pip install -r tools/ci/requirements-build.txt
484483
# hack the construct==2.10.54 to make it work with idf-v4.4, Python3.12
485484
# imp is not present in Python3.12 so remove it
486485
- wget https://files.pythonhosted.org/packages/30/2f/e2e6bad1b80f744cf5c2a6d622e3dee698b43e6c040f980ae0ac0edd5e54/construct-2.10.54.tar.gz
487486
- tar -xvzf construct-2.10.54.tar.gz
488487
- sed -i 's/, imp$//g' construct-2.10.54/construct/core.py
489488
- python3 -m pip install ./construct-2.10.54
490489
- rm -rf construct-2.10.54*
491-
- python tools/ci/build_apps.py ./examples --pytest_c3
490+
- cd ${ESP_MATTER_PATH}/examples/light
491+
- idf.py set-target esp32c3
492+
- idf.py build
492493
variables:
493494
IDF_CHECKOUT_REF: "v4.4.3"
494495

496+
497+
build_esp_matter_examples_pytest_C3:
498+
extends:
499+
- .build_examples_template
500+
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
501+
artifacts:
502+
paths:
503+
- "examples/**/build*/size.json"
504+
- "examples/**/build*/build_log.txt"
505+
- "examples/**/build*/*.map"
506+
- "examples/**/build*/*.bin"
507+
- "examples/**/build*/flasher_args.json"
508+
- "examples/**/build*/config/sdkconfig.json"
509+
- "examples/**/build*/bootloader/*.bin"
510+
- "examples/**/build*/partition_table/*.bin"
511+
when: always
512+
expire_in: 4 days
513+
script:
514+
- cd ${ESP_MATTER_PATH}
515+
- pip install -r tools/ci/requirements-build.txt
516+
- python tools/ci/build_apps.py ./examples --pytest_c3
517+
518+
495519
pytest_esp32c3_esp_matter_dut:
496520
stage: target_test
497521
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
498522
rules:
499523
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push"
500524
needs:
501-
- build_esp_matter_examples_pytest_C3_idf_v4_4
525+
- build_esp_matter_examples_pytest_C3
502526
script:
503527
- cd ${ESP_MATTER_PATH}
504528
- rm -rf connectedhomeip/connectedhomeip
505529
- ln -s ${CHIP_SUBMODULE_PATH} connectedhomeip/connectedhomeip
506530
- pip install -r tools/ci/requirements-pytest.txt
507531
- pytest examples/ --target esp32c3 -m esp_matter_dut --junitxml=XUNIT_RESULT.xml
508532
tags: ["esp32c3", "esp_matter_dut"]
509-
variables:
510-
IDF_CHECKOUT_REF: "v4.4.3"
511533

512534
pytest_esp32c6_esp_matter_dut:
513535
stage: target_test
514536
image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
515537
rules:
516538
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push"
517539
needs:
518-
- build_esp_matter_examples_pytest_C6_idf_v5_1
540+
- build_esp_matter_examples_pytest_C6
519541
script:
520542
- cd ${ESP_MATTER_PATH}
521543
- rm -rf connectedhomeip/connectedhomeip
@@ -540,7 +562,7 @@ pytest_esp32c2_esp_matter_dut:
540562
rules:
541563
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push"
542564
needs:
543-
- build_esp_matter_examples_pytest_C2_idf_v5_1
565+
- build_esp_matter_examples_pytest_C2
544566
script:
545567
- cd ${ESP_MATTER_PATH}
546568
- rm -rf connectedhomeip/connectedhomeip
@@ -559,7 +581,7 @@ pytest_esp32h2_esp_matter_dut:
559581
rules:
560582
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "push"
561583
needs:
562-
- build_esp_matter_examples_pytest_H2_idf_v5_1
584+
- build_esp_matter_examples_pytest_H2
563585
script:
564586
- cd ${ESP_MATTER_PATH}
565587
- rm -rf connectedhomeip/connectedhomeip

0 commit comments

Comments
 (0)