alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ci: update dockerfile to 5.0

Browse Source
This commit is contained in:
Fu Hanxi 2021-12-24 18:03:13 +08:00
parent 8b928bf22f
commit 73c5644044
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -56,11 +56,12 @@ variables:
# Docker images # Docker images
BOT_DOCKER_IMAGE_TAG: ":latest" BOT_DOCKER_IMAGE_TAG: ":latest"
ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v5" ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.0:1"
ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env:v4.4-1" AFL_FUZZER_TEST_IMAGE: "${CI_DOCKER_REGISTRY}/afl-fuzzer-test-v5.0:1-1"
AFL_FUZZER_TEST_IMAGE: "$CI_DOCKER_REGISTRY/afl-fuzzer-test:v4.4-1-1" CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.0:1-1"
CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis:v4.4-1-2" ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.0:1-1"
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3"
LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells:2"
# target test config file, used by assign test job # target test config file, used by assign test job
CI_TARGET_TEST_CONFIG_FILE: "$CI_PROJECT_DIR/.gitlab/ci/target-test.yml" CI_TARGET_TEST_CONFIG_FILE: "$CI_PROJECT_DIR/.gitlab/ci/target-test.yml"

5
.gitlab/ci/host-test.yml
View File

@ -57,6 +57,7 @@ test_ldgen_on_host:
extends: .host_test_template extends: .host_test_template
script: script:
- cd tools/ldgen/test - cd tools/ldgen/test
- export PYTHONPATH=$PYTHONPATH:..
- python -m unittest - python -m unittest
variables: variables:
LC_ALL: C.UTF-8 LC_ALL: C.UTF-8
@ -314,7 +315,7 @@ test_mkuf2:
test_autocomplete: test_autocomplete:
extends: .host_test_template extends: .host_test_template
image: $CI_DOCKER_REGISTRY/linux-shells:1 image: $LINUX_SHELL_IMAGE
artifacts: artifacts:
when: on_failure when: on_failure
paths: paths:
@ -325,7 +326,7 @@ test_autocomplete:
test_detect_python: test_detect_python:
extends: .host_test_template extends: .host_test_template
image: $CI_DOCKER_REGISTRY/linux-shells:1 image: $LINUX_SHELL_IMAGE
script: script:
- cd ${IDF_PATH} - cd ${IDF_PATH}
- shellcheck -s sh tools/detect_python.sh - shellcheck -s sh tools/detect_python.sh