From c35b7dca0f98fd057cc43eba36e6bb04d37fe68e Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 21 Mar 2025 14:39:35 +0800 Subject: [PATCH] Revert "5.5: Update ubuntu base image for esp-env-v5.5 to 24.04" This reverts commit 60ed896b08fec9885c0c46bbbc2fd572044bb2b5. --- .gitlab/ci/common.yml | 2 +- .gitlab/ci/host-test.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml index 57d27a3467..d8f1091db1 100644 --- a/.gitlab/ci/common.yml +++ b/.gitlab/ci/common.yml @@ -55,7 +55,7 @@ variables: CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py" # Docker images - ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:3" + ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:2" ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:2-1" TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:2" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5" diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index dbbefdc075..66e945b6e4 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -239,7 +239,6 @@ test_mqtt_on_host: test_transport_on_host: extends: .host_test_template - allow_failure: true # IDFCI-2781 [v5.5, v5.4] test_transport_on_host fails on ubuntu 24.04 script: - cd ${IDF_PATH}/components/tcp_transport/host_test - idf.py build