From e42e2bb4824a8c1d14b220ddfe324dba52e2a028 Mon Sep 17 00:00:00 2001 From: Evgeny Torbin Date: Tue, 14 Apr 2026 15:15:50 +0200 Subject: [PATCH 1/2] ci: use idf images from Gitlab Container Registry --- .gitlab/ci/common.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index a6c0d3fc2d8..f356fac9711 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -54,10 +54,10 @@ variables: CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py" # Docker images - ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.2:2" - ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.2:2-1" - QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.2:2-20230522" - TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.2:2" + ESP_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v5.2:1" + ESP_IDF_DOC_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v5.2-docs:1" + QEMU_IMAGE: "${CI_REGISTRY}/ci/images/idf-v5.2-qemu:1" + TARGET_TEST_ENV_IMAGE: "${CI_REGISTRY}/ci/images/idf-v5.2-target-test:1" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5" PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1" From 8e0bda58aaaf1a3190aca01feca9f4e15aa6ba36 Mon Sep 17 00:00:00 2001 From: Evgeny Torbin Date: Tue, 14 Apr 2026 15:16:17 +0200 Subject: [PATCH 2/2] ci: use `--break-system-packages` option when installing jsonschema --- .gitlab/ci/host-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index 33d6174eb81..b8b51fdd690 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -129,7 +129,7 @@ test_idf_tools: # cmake@version that is supported - python3 ${IDF_PATH}/tools/idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.16.3 - cd ${IDF_PATH}/tools/test_idf_tools - - python3 -m pip install jsonschema + - python3 -m pip install jsonschema --break-system-packages - python3 ./test_idf_tools.py -v - python3 ./test_idf_tools_python_env.py