From 6cead0081d0298734f31be2e9c8c7b76bd6d2267 Mon Sep 17 00:00:00 2001
From: aleks <aleks@espressif.com>
Date: Thu, 21 Aug 2025 12:28:56 +0200
Subject: [PATCH] ci fix list of esp-idf versions and target test jobs

---
 .gitlab-ci.yml | 61 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9f08a5..7ce07b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
 # Define a matrix for IDF versions and their corresponding targets
 .options_list:
 #  versions:
-#    IDF_VER: ["latest", "v5.3", "v5.2", "v5.0"]
+#    IDF_VER: ["latest", "v5.5", "v5.3", "v5.1"]
   analyzers:
     ANALYZER_TYPE: [gcc, clang]
   markers:
@@ -178,26 +178,26 @@ build_idf_latest:
   extends: .build_pytest_template
   image: espressif/idf:latest
   variables:
-    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2"
+    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c61 esp32c6 esp32h2 esp32p4"
+
+build_idf_v5.5:
+  extends: .build_pytest_template
+  image: espressif/idf:release-v5.5
+  variables:
+    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4"
 
 build_idf_v5.3:
   extends: .build_pytest_template
   image: espressif/idf:release-v5.3
+  variables:
+    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4"
+
+build_idf_v5.1:
+  extends: .build_pytest_template
+  image: espressif/idf:release-v5.1
   variables:
     TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2"
 
-build_idf_v5.2:
-  extends: .build_pytest_template
-  image: espressif/idf:release-v5.2
-  variables:
-    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
-
-build_idf_v5.0:
-  extends: .build_pytest_template
-  image: espressif/idf:release-v5.0
-  variables:
-    TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3"
-
 .target_test_template:
   stage: target_test
   timeout: 1 hour
@@ -217,6 +217,7 @@ build_idf_v5.0:
     - pip install -r ${TEST_DIR}/tools/test_requirements.txt
     # Upgrade the packages (workaround for esp-idf v5.0)
     - pip install --only-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf --upgrade
+    - ${IDF_PATH}/install.sh --enable-ci
 
 .test_cur_folder: &test_cur_folder |
   export IDF_VER=$(cat ${TEST_DIR}/idf_version_info.txt)
@@ -257,7 +258,7 @@ build_idf_v5.0:
 
 target_test_latest:
   stage: target_test
-  image: "$CI_DOCKER_REGISTRY/target-test-env-v5.4:1"
+  image: "$CI_DOCKER_REGISTRY/target-test-env-v6.0:2"
   extends: .test_template
   parallel:
     matrix:
@@ -267,6 +268,18 @@ target_test_latest:
     artifacts: true
   after_script: []
 
+target_test_v5.5:
+  stage: target_test
+  image: "$CI_DOCKER_REGISTRY/target-test-env-v5.5:2"
+  extends: .test_template
+  parallel:
+    matrix:
+      - !reference [.options_list, markers]
+  needs:
+    job: build_idf_v5.5
+    artifacts: true
+  after_script: []
+
 target_test_v5.3:
   stage: target_test
   image: "$CI_DOCKER_REGISTRY/target-test-env-v5.3:1"
@@ -279,27 +292,15 @@ target_test_v5.3:
     artifacts: true
   after_script: []
 
-target_test_v5.2:
+target_test_v5.1:
   stage: target_test
-  image: "$CI_DOCKER_REGISTRY/target-test-env-v5.2:2"
+  image: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1"
   extends: .test_template
   parallel:
     matrix:
       - !reference [.options_list, markers]
   needs:
-    job: build_idf_v5.2
-    artifacts: true
-  after_script: []
-
-target_test_v5.0:
-  stage: target_test
-  image: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:3"
-  extends: .test_template
-  parallel:
-    matrix:
-      - !reference [.options_list, markers]
-  needs:
-    job: build_idf_v5.0
+    job: build_idf_v5.1
     artifacts: true
   after_script: []