feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

ci(qemu): use qemu from tools.json, don't require a special image

Browse Source
This commit is contained in:
Ivan Grokhotkov
2023-11-28 19:16:31 +01:00
parent 71153c7dbb
commit 178b27ed80
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/ci/common.yml
View File

@@ -51,7 +51,6 @@ variables:
# Docker images # Docker images
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.3:1" ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.3:1"
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.3:1-1" ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.3:1-1"
QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.3:1-20230522"
TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.3:1" TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.3:1"
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1" PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"

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

@@ -281,7 +281,6 @@ test_pytest_qemu:
extends: extends:
- .host_test_template - .host_test_template
- .before_script:build - .before_script:build
image: $QEMU_IMAGE
artifacts: artifacts:
when: always when: always
paths: paths:
@@ -294,6 +293,8 @@ test_pytest_qemu:
parallel: parallel:
matrix: matrix:
- IDF_TARGET: [esp32, esp32c3] - IDF_TARGET: [esp32, esp32c3]
variables:
INSTALL_QEMU: 1
script: script:
- run_cmd python tools/ci/ci_build_apps.py . -vv - run_cmd python tools/ci/ci_build_apps.py . -vv
--target $IDF_TARGET --target $IDF_TARGET