From 6adb0ea4575df5ee59d5ea601883310991f36546 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Thu, 6 Nov 2025 10:30:22 +0100
Subject: [PATCH 01/10] ci: remove temp minio variables

---
 .gitlab/ci/common.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index ff5efca0bc..b8656aa866 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -122,11 +122,6 @@ variables:
   # add extra python packages
   export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci:$IDF_PATH/tools/esp_app_trace:$IDF_PATH/components/partition_table:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
 
-  # minio configuration
-  # added here since the precedence of variables in gitlab-ci.yml is lower than project settings
-  export IDF_S3_SERVER="$IDF_S3_NEW_SERVER"
-  export IDF_S3_ACCESS_KEY="$IDF_S3_NEW_ACCESS_KEY"
-
 .setup_tools_and_idf_python_venv: &setup_tools_and_idf_python_venv |
   # must use after setup_tools_except_target_test
   # otherwise the export.sh won't work properly

From 5304e95ac57e7e7563762d7bd001f5314228064f Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:26:53 +0100
Subject: [PATCH 02/10] ci: remove generate_build_child_pipeline.py

---
 .gitlab/ci/build.yml                          |  6 +-
 .../scripts/generate_build_child_pipeline.py  | 82 -------------------
 2 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100644 tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index de71c54012..94defbcff1 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -344,7 +344,11 @@ generate_build_child_pipeline:
     expire_in: 1 week
     when: always
   script:
-    - run_cmd python tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py
+    - run_cmd idf-ci --debug gitlab build-child-pipeline
+      -p components
+      -p examples
+      -p tools/test_apps
+      --modified-files $MR_MODIFIED_FILES
 
 build_child_pipeline:
   stage: build
diff --git a/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py b/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py
deleted file mode 100644
index 580d45ecce..0000000000
--- a/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Apache-2.0
-"""This file is used for generating the child pipeline for build jobs."""
-
-import argparse
-import logging
-import os
-
-import __init__  # noqa: F401 # inject the system path
-from idf_build_apps.utils import semicolon_separated_str_to_list
-from idf_ci.idf_gitlab import build_child_pipeline
-from idf_ci.utils import setup_logging
-from idf_ci_utils import IDF_PATH
-
-BUILD_CHILD_PIPELINE_FILEPATH = os.path.join(IDF_PATH, 'build_child_pipeline.yml')
-TEST_PATHS = ['examples', os.path.join('tools', 'test_apps'), 'components']
-
-
-def _separate_str_to_list(s: str) -> list[str]:
-    """
-    Gitlab env file will escape the doublequotes in the env file, so we need to remove them
-
-    For example,
-
-    in pipeline.env file we have
-
-    MR_MODIFIED_COMPONENTS="app1;app2"
-    MR_MODIFIED_FILES="main/app1.c;main/app2.c"
-
-    gitlab will load the doublequotes as well, so we need to remove the doublequotes
-    """
-    return semicolon_separated_str_to_list(s.strip('"'))  # type: ignore
-
-
-def main(arguments: argparse.Namespace) -> None:
-    setup_logging(logging.DEBUG)
-    build_child_pipeline(
-        paths=args.paths,
-        modified_files=args.modified_files,
-        compare_manifest_sha_filepath=args.compare_manifest_sha_filepath,
-        yaml_output=args.yaml_output,
-    )
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Generate build child pipeline',
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-    )
-    parser.add_argument(
-        '-o',
-        '--yaml-output',
-        default=BUILD_CHILD_PIPELINE_FILEPATH,
-        help='Output YAML path',
-    )
-    # use relative path to avoid absolute path in pipeline
-    parser.add_argument(
-        '-p',
-        '--paths',
-        nargs='+',
-        default=TEST_PATHS,
-        help='Paths to the apps to build.',
-    )
-    parser.add_argument(
-        '--compare-manifest-sha-filepath',
-        default=os.path.join(IDF_PATH, '.manifest_sha'),
-        help='Path to the recorded manifest sha file generated by `idf-build-apps dump-manifest-sha`',
-    )
-    parser.add_argument(
-        '--modified-files',
-        type=_separate_str_to_list,
-        default=os.getenv('MR_MODIFIED_FILES'),
-        help='semicolon-separated string which specifies the modified files. '
-        'app with `depends_filepatterns` set in the corresponding manifest files would only be built '
-        'if any of the specified file pattern matches any of the specified modified files. '
-        'If set to "", the value would be considered as None. '
-        'If set to ";", the value would be considered as an empty list',
-    )
-
-    args = parser.parse_args()
-
-    main(args)

From aa60a836b55d9c0597243eb65b4aa6376fb8c3ed Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Thu, 6 Nov 2025 11:41:19 +0100
Subject: [PATCH 03/10] ci: upload build junit files

---
 .idf_ci.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idf_ci.toml b/.idf_ci.toml
index 835a8552d1..e16384aab8 100644
--- a/.idf_ci.toml
+++ b/.idf_ci.toml
@@ -89,6 +89,7 @@ patterns = [
 bucket = "idf-artifacts"
 patterns = [
     '**/XUNIT_RESULT_*.xml',
+    '**/build_summary_*.xml',
 ]
 
 [gitlab.artifacts.s3.env]

From 0f0d97f958d5a3a7b52a1a36e9cb3cf548d4309b Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:27:07 +0100
Subject: [PATCH 04/10] ci: cleanup after_script:build related rules

---
 .gitlab/ci/build.yml                                |  4 ++--
 .gitlab/ci/common.yml                               | 13 +++----------
 .gitlab/ci/rules.yml                                |  3 ---
 .../dynamic_pipelines/templates/.dynamic_jobs.yml   |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 94defbcff1..eef183ffff 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -1,7 +1,7 @@
 .build_template:
   stage: build
   extends:
-    - .after_script:build:ccache-show-stats:upload-failed-job-logs
+    - .after_script:build
   image: $ESP_ENV_IMAGE
   tags: [build, shiny]
   variables:
@@ -13,7 +13,7 @@
   extends:
     - .build_template
     - .before_script:build
-    - .after_script:build:ccache-show-stats
+    - .after_script:build
   dependencies: # set dependencies to null to avoid missing artifacts issue
   needs:
     - job: fast_template_app
diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index b8656aa866..a74c634098 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -224,7 +224,9 @@ variables:
 
 .show_ccache_statistics: &show_ccache_statistics |
   # Show ccache statistics if enabled globally
+  section_start "ccache_show_stats" "Show ccache statistics"
   test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats -vv || true
+  section_end "ccache_show_stats"
 
 .upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts |
   if [ $CI_JOB_STATUS = "failed" ]; then
@@ -244,19 +246,10 @@ variables:
     - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
     - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
 
-.after_script:build:ccache-show-stats:
+.after_script:build:
   after_script:
     - source tools/ci/utils.sh
-    - section_start "ccache_show_stats" "Show ccache statistics"
     - *show_ccache_statistics
-    - section_end "ccache_show_stats"
-
-.after_script:build:ccache-show-stats:upload-failed-job-logs:
-  after_script:
-    - source tools/ci/utils.sh
-    - section_start "ccache_show_stats" "Show ccache statistics"
-    - *show_ccache_statistics
-    - section_end "ccache_show_stats"
     - *upload_failed_job_log_artifacts
 
 ##############################
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 590ff2f087..c5cc6fa0be 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -59,9 +59,6 @@
 .patterns-build_system_win: &patterns-build_system_win
   - "tools/test_build_system/**/*"
 
-.patterns-build_macos: &patterns-build_macos
-  - "tools/ci/test_configure_ci_environment.sh"
-
 .patterns-build_check: &patterns-build_check
   - "tools/test_build_system/**/*"
   - "tools/ci/test_configure_ci_environment.sh"
diff --git a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
index 1fd97e93fa..af3e16bd77 100644
--- a/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+++ b/tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
@@ -7,7 +7,7 @@
 .dynamic_build_template:
   extends:
     - .before_script:build
-    - .after_script:build:ccache-show-stats:upload-failed-job-logs
+    - .after_script:build
   image: $ESP_ENV_IMAGE
   tags: [build, shiny]
   stage: build

From 04a9e1ba23bd9d9fd6fb6750d271117d146fce8a Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:29:23 +0100
Subject: [PATCH 05/10] ci: cleanup build_clang_test_apps jobs

---
 .gitlab/ci/build.yml | 139 +++++++++++++------------------------------
 1 file changed, 41 insertions(+), 98 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index eef183ffff..df8a5f5320 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -1,49 +1,14 @@
 .build_template:
   stage: build
   extends:
+    - .before_script:build
     - .after_script:build
   image: $ESP_ENV_IMAGE
   tags: [build, shiny]
   variables:
     # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
     IDF_CCACHE_ENABLE: "1"
-  dependencies: []
-
-.build_cmake_clang_template:
-  extends:
-    - .build_template
-    - .before_script:build
-    - .after_script:build
   dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-    - pipeline_variables
-  artifacts:
-    paths:
-      # The other artifacts patterns are defined under .idf_ci.toml
-      # Now we're uploading/downloading the binary files from our internal storage server
-      #
-      # keep the log file to help debug
-      - "**/build*/build_log.txt"
-      # keep the size info to help track the binary size
-      - size_info.txt
-      - "**/build*/size*.json"
-    expire_in: 1 week
-    when: always
-  variables:
-    IDF_TOOLCHAIN: clang
-    TEST_BUILD_OPTS_EXTRA: ""
-  script:
-    # CI specific options start from "--parallel-count xxx". could ignore when running locally
-    - run_cmd idf-build-apps build
-      -p tools/test_apps/system/clang_build_test
-      -t $IDF_TARGET
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      --modified-components ${MR_MODIFIED_COMPONENTS}
-      --modified-files ${MR_MODIFIED_FILES}
-      $TEST_BUILD_OPTS_EXTRA
 
 ######################
 # build_template_app #
@@ -51,7 +16,6 @@
 .build_template_app_template:
   extends:
     - .build_template
-    - .before_script:build
   variables:
     LOG_PATH: "${CI_PROJECT_DIR}/log_template_app"
     BUILD_PATH: "${CI_PROJECT_DIR}/build_template_app"
@@ -107,30 +71,48 @@ gcc_static_analyzer:
 ########################################
 # Clang Build Apps Without Tests Cases #
 ########################################
-build_clang_test_apps_esp32:
+.build_cmake_clang_template:
   extends:
-    - .build_cmake_clang_template
+    - .build_template
     - .rules:build
+  needs:
+    - job: fast_template_app
+      artifacts: false
+    - pipeline_variables
+  artifacts:
+    paths:
+      # The other artifacts patterns are defined under .idf_ci.toml
+      # Now we're uploading/downloading the binary files from our internal storage server
+      #
+      # keep the log file to help debug
+      - "**/build*/build_log.txt"
+      # keep the size info to help track the binary size
+      - size_info.txt
+      - "**/build*/size*.json"
+    expire_in: 1 week
+    when: always
   variables:
-    IDF_TARGET: esp32
+    IDF_TOOLCHAIN: clang
+    TEST_BUILD_OPTS_EXTRA: ""
+  script:
+    # CI specific options start from "--parallel-count xxx". could ignore when running locally
+    - run_cmd idf-build-apps build
+      -p tools/test_apps/system/clang_build_test
+      -t $IDF_TARGET
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+      --modified-components ${MR_MODIFIED_COMPONENTS}
+      --modified-files ${MR_MODIFIED_FILES}
+      $TEST_BUILD_OPTS_EXTRA
 
-build_clang_test_apps_esp32s2:
-  extends:
-    - .build_cmake_clang_template
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32s2
+build_clang_test_apps_xtensa:
+  extends: .build_cmake_clang_template
+  parallel:
+    matrix:
+      - IDF_TARGET: [esp32, esp32s2, esp32s3]
 
-build_clang_test_apps_esp32s3:
-  extends:
-    - .build_cmake_clang_template
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32s3
-
-.build_clang_test_apps_riscv:
-  extends:
-    - .build_cmake_clang_template
+build_clang_test_apps_riscv:
+  extends: .build_cmake_clang_template
   variables:
     # https://reviews.llvm.org/D90108.
     # GNU 'as' lets .weak override .globl since binutils-gdb
@@ -138,48 +120,9 @@ build_clang_test_apps_esp32s3:
     # while MC lets the last directive win (PR38921).
     # For RISCV chips we use integrated assembler by default, so suppress this warning to pass CI pipeline.
     TEST_BUILD_OPTS_EXTRA: "--ignore-warning-str 'changed binding to STB_WEAK'"
-
-build_clang_test_apps_esp32c3:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c3
-
-build_clang_test_apps_esp32c2:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c2
-
-build_clang_test_apps_esp32c6:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c6
-
-build_clang_test_apps_esp32c5:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32c5
-
-build_clang_test_apps_esp32h2:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32h2
-
-build_clang_test_apps_esp32p4:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build
-  variables:
-    IDF_TARGET: esp32p4
+  parallel:
+    matrix:
+      - IDF_TARGET: [esp32c3, esp32c2, esp32c6, esp32c5, esp32h2, esp32p4]
 
 ######################
 # Build System Tests #

From 2988329debfd23fe465739829ccb20bfc97eabc6 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Thu, 6 Nov 2025 11:59:35 +0100
Subject: [PATCH 06/10] ci: cleanup build_template_app jobs

---
 .gitlab/ci/build.yml           | 29 ++++++++++-------------------
 tools/ci/build_template_app.sh |  7 +++++++
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index df8a5f5320..eb73d8d585 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -16,12 +16,6 @@
 .build_template_app_template:
   extends:
     - .build_template
-  variables:
-    LOG_PATH: "${CI_PROJECT_DIR}/log_template_app"
-    BUILD_PATH: "${CI_PROJECT_DIR}/build_template_app"
-    BUILD_DIR: "${BUILD_PATH}/@t/@w"
-    BUILD_LOG_CMAKE: "${LOG_PATH}/cmake_@t_@w.txt"
-    BUILD_COMMAND_ARGS: ""
   artifacts:
     paths:
       - log_template_app/*
@@ -40,7 +34,6 @@
     # Only do the default cmake build for each target, remaining part are done in the build_template_app job
     - tools/ci/build_template_app.sh ${BUILD_COMMAND_ARGS}
 
-# build-related-pre-check-jobs ------------------------------------------------
 # Build at least one project for each target at earliest stage to reduce build cost for obvious failing commits
 fast_template_app:
   extends:
@@ -50,7 +43,16 @@ fast_template_app:
   tags: [fast_run, shiny]
   variables:
     BUILD_COMMAND_ARGS: "-p"
-#------------------------------------------------------------------------------
+
+# This job builds template app with permutations of targets and optimization levels
+build_template_app:
+  extends:
+    - .build_template_app_template
+    - .rules:build
+  stage: host_test
+  needs:
+    - job: fast_template_app
+      artifacts: false
 
 #######################
 # gnu_static_analyzer #
@@ -256,17 +258,6 @@ build_docker:
     # Therefore, build a copy of the example located inside the container.
     - docker run --rm --workdir /opt/esp/idf/examples/get-started/blink ${DOCKER_TMP_IMAGE_NAME} idf.py build
 
-# This job builds template app with permutations of targets and optimization levels
-build_template_app:
-  extends:
-    - .build_template_app_template
-    - .rules:build
-  stage: host_test
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-
 ####################
 # Dynamic Pipeline #
 ####################
diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh
index e4a5e9cff1..14f7ab0bc0 100755
--- a/tools/ci/build_template_app.sh
+++ b/tools/ci/build_template_app.sh
@@ -11,6 +11,13 @@ set -euo pipefail
 
 TEMPLATE_APP_PATH="esp-idf-template"
 
+# Set default paths for template app builds
+BUILD_PATH="${IDF_PATH}/build_template_app"
+BUILD_DIR="${BUILD_PATH}/@t/@w"
+
+LOG_PATH="${IDF_PATH}/log_template_app"
+BUILD_LOG_CMAKE="${LOG_PATH}/cmake_@t_@w.txt"
+
 gen_configs() {
     # CONFIG_COMPILER_OPTIMIZATION_NONE with flag -O0
     echo "CONFIG_COMPILER_OPTIMIZATION_NONE=y" > ${TEMPLATE_APP_PATH}/sdkconfig.ci.O0

From 8ae96e188f293c8771e19d4a531b39705d22156a Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:50:53 +0100
Subject: [PATCH 07/10] ci: cleanup gcc_static_analyzer and `.rules:build`

---
 .gitlab/ci/build.yml                     | 18 +-----------------
 .gitlab/ci/dependencies/dependencies.yml |  3 ---
 .gitlab/ci/pre_check.yml                 | 11 +++++++++++
 .gitlab/ci/rules.yml                     | 19 +------------------
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index eb73d8d585..7070e3d38d 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -38,7 +38,7 @@
 fast_template_app:
   extends:
     - .build_template_app_template
-    - .rules:build:target_test
+    - .rules:build
   stage: pre_check
   tags: [fast_run, shiny]
   variables:
@@ -54,22 +54,6 @@ build_template_app:
     - job: fast_template_app
       artifacts: false
 
-#######################
-# gnu_static_analyzer #
-#######################
-gcc_static_analyzer:
-  extends:
-    - .build_template_app_template
-    - .rules:build:target_test
-  stage: pre_check
-  tags: [build, shiny]
-  variables:
-    CI_CCACHE_DISABLE: 1
-    ANALYZING_APP: "examples/get-started/hello_world"
-  script:
-    - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
-    - idf-build-apps build -p ${ANALYZING_APP}
-
 ########################################
 # Clang Build Apps Without Tests Cases #
 ########################################
diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index db447461b2..31fc506823 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -9,7 +9,6 @@
     - build_system
     - downloadable-tools
   included_in:
-    - build:target_test
     - build:check
 
 # -------------------
@@ -41,8 +40,6 @@
 "patterns:template-app":
   patterns:
     - build_template-app
-  included_in:
-    - build:target_test
 
 "patterns:build-check":
   patterns:
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 6921955d69..758bef51a4 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -191,6 +191,17 @@ baseline_manifest_sha:
     expire_in: 1 week
     when: always
 
+gcc_static_analyzer:
+  extends:
+    - .pre_check_template
+    - .rules:build
+  variables:
+    CI_CCACHE_DISABLE: 1
+    ANALYZING_APP: "examples/get-started/hello_world"
+  script:
+    - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
+    - idf-build-apps build -p ${ANALYZING_APP}
+
 redundant_pass_job:
   extends:
     - .pre_check_template
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index c5cc6fa0be..7277a94d79 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -41,9 +41,6 @@
   - "tools/idf_tools.py"
   - "tools/tools.json"
 
-.patterns-build_template-app: &patterns-build_template-app
-  - "tools/ci/build_template_app.sh"
-
 .patterns-build_system: &patterns-build_system
   - "tools/cmake/**/*"
   - "tools/cmakev2/**/*"
@@ -54,6 +51,7 @@
   - "tools/ci/ignore_build_warnings.txt"
   - "tools/ci/test_build_system*.sh"
   - "tools/ci/test_build_system*.py"
+  - "tools/ci/build_template_app.sh"
   - "tools/test_build_system/**/*"
 
 .patterns-build_system_win: &patterns-build_system_win
@@ -348,21 +346,6 @@
     - <<: *if-label-macos
     - <<: *if-label-macos_test
 
-.rules:build:target_test:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected-check
-    - <<: *if-label-build
-    - <<: *if-dev-push
-      changes: *patterns-build_components
-    - <<: *if-dev-push
-      changes: *patterns-build_system
-    - <<: *if-dev-push
-      changes: *patterns-build_template-app
-    - <<: *if-dev-push
-      changes: *patterns-downloadable-tools
-
 .rules:labels:buildv2:
   rules:
     - <<: *if-revert-branch

From 18bb5bacca9618315c5003dde8da668b869ead53 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:51:20 +0100
Subject: [PATCH 08/10] ci: move the `retry_failed_jobs` to pre_check stage

---
 .gitlab-ci.yml                                |   1 -
 .gitlab/ci/common.yml                         |   1 -
 .gitlab/ci/pre_check.yml                      |  12 +++++-----
 .gitlab/ci/retry_failed_jobs.yml              |  15 ------------
 tools/ci/dynamic_pipelines/constants.py       |   4 ----
 tools/ci/dynamic_pipelines/report.py          |  22 +++---------------
 .../scripts/generate_report.py                |   2 +-
 .../templates/retry-jobs.png                  | Bin 17552 -> 0 bytes
 8 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 .gitlab/ci/retry_failed_jobs.yml
 delete mode 100644 tools/ci/dynamic_pipelines/templates/retry-jobs.png

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c33fe48f6..7c02159d1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,5 +29,4 @@ include:
   - ".gitlab/ci/host-test.yml"
   - ".gitlab/ci/deploy.yml"
   - ".gitlab/ci/post_deploy.yml"
-  - ".gitlab/ci/retry_failed_jobs.yml"
   - ".gitlab/ci/test-win.yml"
diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index a74c634098..1161176b02 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -12,7 +12,6 @@ stages:
   - test_deploy
   - deploy
   - post_deploy
-  - retry_failed_jobs
 
 variables:
 # System environment
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 758bef51a4..49c3920ebd 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -202,13 +202,13 @@ gcc_static_analyzer:
     - echo "CONFIG_COMPILER_STATIC_ANALYZER=y" >> ${ANALYZING_APP}/sdkconfig.defaults
     - idf-build-apps build -p ${ANALYZING_APP}
 
-redundant_pass_job:
+retry_failed_jobs:
   extends:
     - .pre_check_template
+    - .rules:dev-push
   tags: [shiny, fast_run]
-  cache: []
-  variables:
-    GIT_STRATEGY: none
-  before_script: []
+  allow_failure: true
   script:
-    - echo "This job is redundant to ensure the 'retry_failed_jobs' job can exist and not be skipped"
+    - echo "Retrieving and retrying all failed jobs for the pipeline..."
+    - python tools/ci/python_packages/gitlab_api.py retry_failed_jobs $CI_MERGE_REQUEST_PROJECT_ID --pipeline_id $CI_PIPELINE_ID
+  when: manual
diff --git a/.gitlab/ci/retry_failed_jobs.yml b/.gitlab/ci/retry_failed_jobs.yml
deleted file mode 100644
index 8eff2ed6b4..0000000000
--- a/.gitlab/ci/retry_failed_jobs.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-retry_failed_jobs:
-  stage: retry_failed_jobs
-  tags: [shiny, fast_run]
-  allow_failure: true
-  image: $ESP_ENV_IMAGE
-  dependencies: null
-  before_script: []
-  cache: []
-  extends: []
-  script:
-    - echo "Retrieving and retrying all failed jobs for the pipeline..."
-    - python tools/ci/python_packages/gitlab_api.py retry_failed_jobs $CI_MERGE_REQUEST_PROJECT_ID --pipeline_id $CI_PIPELINE_ID
-  when: manual
-  needs:
-    - redundant_pass_job
diff --git a/tools/ci/dynamic_pipelines/constants.py b/tools/ci/dynamic_pipelines/constants.py
index a85e9a5793..40dbe346d1 100644
--- a/tools/ci/dynamic_pipelines/constants.py
+++ b/tools/ci/dynamic_pipelines/constants.py
@@ -15,10 +15,6 @@ TOP_N_APPS_BY_SIZE_DIFF = 10
 SIZE_DIFFERENCE_BYTES_THRESHOLD = 500
 BINARY_SIZE_METRIC_NAME = 'binary_size'
 
-RETRY_JOB_PICTURE_PATH = 'tools/ci/dynamic_pipelines/templates/retry-jobs.png'
-RETRY_JOB_TITLE = '\n\nRetry failed jobs with with help of "retry_failed_jobs" stage of the pipeline:'
-RETRY_JOB_PICTURE_LINK = '![Retry Jobs Image]({pic_url})'
-
 KNOWN_GENERATE_TEST_CHILD_PIPELINE_WARNINGS_FILEPATH = os.path.join(
     IDF_PATH, 'tools', 'ci', 'dynamic_pipelines', 'templates', 'known_generate_test_child_pipeline_warnings.yml'
 )
diff --git a/tools/ci/dynamic_pipelines/report.py b/tools/ci/dynamic_pipelines/report.py
index 1ae1f04778..24b0ed9a03 100644
--- a/tools/ci/dynamic_pipelines/report.py
+++ b/tools/ci/dynamic_pipelines/report.py
@@ -19,16 +19,12 @@ from .constants import COMMENT_START_MARKER
 from .constants import CSS_STYLES_FILEPATH
 from .constants import JS_SCRIPTS_FILEPATH
 from .constants import REPORT_TEMPLATE_FILEPATH
-from .constants import RETRY_JOB_PICTURE_LINK
-from .constants import RETRY_JOB_PICTURE_PATH
-from .constants import RETRY_JOB_TITLE
 from .constants import SIZE_DIFFERENCE_BYTES_THRESHOLD
 from .constants import TOP_N_APPS_BY_SIZE_DIFF
 from .models import GitlabJob
 from .models import TestCase
 from .utils import format_permalink
 from .utils import get_artifacts_url
-from .utils import get_repository_file_url
 from .utils import is_url
 
 
@@ -286,25 +282,13 @@ class ReportGenerator:
 
         return comment
 
-    def _update_mr_comment(self, comment: str, print_retry_jobs_message: bool) -> None:
-        retry_job_picture_comment = (f'{RETRY_JOB_TITLE}\n\n{RETRY_JOB_PICTURE_LINK}').format(
-            pic_url=get_repository_file_url(RETRY_JOB_PICTURE_PATH)
-        )
-        del_retry_job_pic_pattern = re.escape(RETRY_JOB_TITLE) + r'.*?' + re.escape(f'{RETRY_JOB_PICTURE_PATH})')
-
+    def _update_mr_comment(self, comment: str) -> None:
         new_comment = f'{COMMENT_START_MARKER}\n\n{comment}'
-        if print_retry_jobs_message:
-            new_comment += retry_job_picture_comment
 
         for note in self.mr.notes.list(iterator=True):
             if note.body.startswith(COMMENT_START_MARKER):
                 updated_str = self._get_updated_comment(note.body, comment)
 
-                # Add retry job message only if any job has failed
-                if print_retry_jobs_message:
-                    updated_str = re.sub(del_retry_job_pic_pattern, '', updated_str, flags=re.DOTALL)
-                    updated_str += retry_job_picture_comment
-
                 note.body = updated_str
                 try:
                     note.save()
@@ -321,7 +305,7 @@ class ReportGenerator:
             updated_str = f'{existing_comment.strip()}\n\n{new_comment}'
         return updated_str
 
-    def post_report(self, print_retry_jobs_message: bool = False) -> None:
+    def post_report(self) -> None:
         comment = self._generate_comment()
 
         print(comment)
@@ -330,7 +314,7 @@ class ReportGenerator:
             print('No MR found, skip posting comment')
             return
 
-        self._update_mr_comment(comment, print_retry_jobs_message=print_retry_jobs_message)
+        self._update_mr_comment(comment)
 
 
 class BuildReportGenerator(ReportGenerator):
diff --git a/tools/ci/dynamic_pipelines/scripts/generate_report.py b/tools/ci/dynamic_pipelines/scripts/generate_report.py
index 83829c8558..1f40fff50a 100644
--- a/tools/ci/dynamic_pipelines/scripts/generate_report.py
+++ b/tools/ci/dynamic_pipelines/scripts/generate_report.py
@@ -110,7 +110,7 @@ def generate_jobs_report(args: argparse.Namespace) -> None:
     report_generator = JobReportGenerator(
         args.project_id, args.mr_iid, args.pipeline_id, args.job_id, args.commit_id, args.local_commit_id, jobs=jobs
     )
-    report_generator.post_report(print_retry_jobs_message=any(job.is_failed for job in jobs))
+    report_generator.post_report()
 
     if GitlabEnvVars().IDF_CI_IS_DEBUG_PIPELINE:
         print('Debug pipeline detected, exit non-zero to fail the pipeline in order to block merge')
diff --git a/tools/ci/dynamic_pipelines/templates/retry-jobs.png b/tools/ci/dynamic_pipelines/templates/retry-jobs.png
deleted file mode 100644
index a8a60112c01546ea8c8ff06fc5b8d30f83ed4bcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17552
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


From fa776a7d5071f2ff80f354a95dacf4c6b44ce718 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Wed, 19 Nov 2025 10:54:26 +0100
Subject: [PATCH 09/10] ci: move host test jobs into host-test.yml

---
 .gitlab/ci/build.yml     | 132 ------------------------
 .gitlab/ci/host-test.yml | 213 ++++++++++++++++++++++++++++++++-------
 2 files changed, 174 insertions(+), 171 deletions(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 7070e3d38d..abee0d6a8f 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -110,138 +110,6 @@ build_clang_test_apps_riscv:
     matrix:
       - IDF_TARGET: [esp32c3, esp32c2, esp32c6, esp32c5, esp32h2, esp32p4]
 
-######################
-# Build System Tests #
-######################
-.test_build_system_template:
-  stage: host_test
-  extends:
-    - .build_template
-    - .rules:build:check
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-      optional: true
-  artifacts:
-    reports:
-      junit: XUNIT_RESULT.xml
-    paths:
-      - XUNIT_RESULT.xml
-      - test_build_system
-    expire_in: 1 week
-    when: always
-  script:
-    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
-    - cd ${IDF_PATH}/tools/test_build_system
-    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
-    - pytest
-      --cleanup-idf-copy
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      --work-dir ${CI_PROJECT_DIR}/test_build_system
-      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
-      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-
-.test_build_system_minimal_cmake_template:
-  extends: .test_build_system_template
-  variables:
-    INSTALL_EXTRA_TOOLS: cmake@3.22.1
-  script:
-    - MINIMAL_SUPPORTED_CMAKE_VERSION=$(echo "${INSTALL_EXTRA_TOOLS}" | sed -n 's/.*cmake@\([0-9.]*\).*/\1/p')
-    - export PATH=$(echo "$PATH" | sed -E "s|/tools/cmake/[0-9.]+|/tools/cmake/${MINIMAL_SUPPORTED_CMAKE_VERSION}|")
-    - ACTUAL_CMAKE_VERSION=$(cmake --version | head -n1 | awk '{print $3}')
-    - |
-      if [ "${ACTUAL_CMAKE_VERSION}" != "${MINIMAL_SUPPORTED_CMAKE_VERSION}" ]; then
-        echo "ERROR: Wrong minimal CMake version! Detected: ${ACTUAL_CMAKE_VERSION}, but should be: ${MINIMAL_SUPPORTED_CMAKE_VERSION}"
-        exit 1
-      fi
-    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
-    - cd ${IDF_PATH}/tools/test_build_system
-    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
-    - pytest
-      -k cmake
-      --cleanup-idf-copy
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      --work-dir ${CI_PROJECT_DIR}/test_build_system
-      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
-      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-
-pytest_build_system:
-  extends: .test_build_system_template
-  parallel: 3
-
-pytest_buildv2_system:
-  extends:
-    - .test_build_system_template
-    - .rules:labels:buildv2
-  parallel: 3
-  script:
-    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
-    - cd ${IDF_PATH}/tools/test_build_system
-    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
-    - pytest
-      --buildv2
-      --cleanup-idf-copy
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      --work-dir ${CI_PROJECT_DIR}/test_build_system
-      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
-      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
-      --
-      test_non_default_target.py
-      test_component_manager.py
-      test_build.py
-      test_bootloader.py
-      test_git.py
-      test_kconfig.py
-      test_partition.py
-      test_reproducible_build.py
-      test_sdkconfig.py
-      test_versions.py
-      test_common.py
-      test_components.py
-      test_cmake.py
-      test_idf_extension.py
-      test_rebuild.py
-
-pytest_build_system_macos:
-  extends:
-    - .test_build_system_template
-    - .brew-macos-settings
-    - .rules:build:macos
-  parallel: 3
-
-pytest_build_system_minimal_cmake:
-  extends: .test_build_system_minimal_cmake_template
-
-pytest_build_system_macos_minimal_cmake:
-  extends:
-    - .test_build_system_minimal_cmake_template
-    - .brew-macos-settings
-    - .rules:build:macos
-  variables:
-    INSTALL_EXTRA_TOOLS: ninja cmake@3.22.1
-
-build_docker:
-  extends:
-    - .before_script:minimal
-    - .rules:build:docker
-  stage: host_test
-  needs: []
-  image: espressif/docker-builder:1
-  tags: [shiny, dind]
-  variables:
-    DOCKER_TMP_IMAGE_NAME: "idf_tmp_image"
-  script:
-    - export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} --build-arg IDF_CLONE_SHALLOW=1 --build-arg IDF_GITHUB_ASSETS=${INTERNAL_GITHUB_ASSETS}"
-    - docker build --tag ${DOCKER_TMP_IMAGE_NAME} ${DOCKER_BUILD_ARGS} tools/docker/
-    # We can't mount $PWD/examples/get-started/blink into the container, see https://gitlab.com/gitlab-org/gitlab-ce/issues/41227.
-    # The workaround mentioned there works, but leaves around directories which need to be cleaned up manually.
-    # Therefore, build a copy of the example located inside the container.
-    - docker run --rm --workdir /opt/esp/idf/examples/get-started/blink ${DOCKER_TMP_IMAGE_NAME} idf.py build
-
 ####################
 # Dynamic Pipeline #
 ####################
diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml
index 762e2d285a..58b990448a 100644
--- a/.gitlab/ci/host-test.yml
+++ b/.gitlab/ci/host-test.yml
@@ -258,6 +258,75 @@ test_gen_soc_caps_kconfig:
     - cd ${IDF_PATH}/tools/gen_soc_caps_kconfig/
     - ./test/test_gen_soc_caps_kconfig.py
 
+test_idf_build_apps_load_soc_caps:
+  extends: .host_test_template
+  script:
+    - python tools/ci/check_soc_headers_load_in_idf_build_apps.py
+
+test_nvs_gen_check:
+  extends: .host_test_template
+  artifacts:
+    paths:
+      - XUNIT_RESULT.xml
+      - components/nvs_flash/nvs_partition_tool
+    reports:
+      junit: XUNIT_RESULT.xml
+  variables:
+    LC_ALL: C.UTF-8
+  script:
+    - cd ${IDF_PATH}/components/nvs_flash/nvs_partition_tool
+    - pytest --noconftest test_nvs_gen_check.py --junitxml=XUNIT_RESULT.xml
+
+test_esp_rom:
+  extends: .host_test_template
+  artifacts:
+    paths:
+      - XUNIT_RESULT.xml
+    reports:
+      junit: XUNIT_RESULT.xml
+  script:
+    - cd ${IDF_PATH}/components/esp_rom/
+    - pytest --noconftest test_esp_rom.py --junitxml=XUNIT_RESULT.xml
+
+make_sure_soc_caps_compatible_in_idf_build_apps:
+    extends:
+      - .host_test_template
+      - .rules:dev-push
+    artifacts:
+      paths:
+        - new.json
+        - base.json
+      when: always
+    when: manual
+    script:
+      - python tools/ci/idf_build_apps_dump_soc_caps.py new.json
+      - git fetch --depth=1 origin $CI_MERGE_REQUEST_DIFF_BASE_SHA
+      - git checkout -f $CI_MERGE_REQUEST_DIFF_BASE_SHA
+      - git checkout $CI_COMMIT_SHA -- tools/ci/idf_build_apps_dump_soc_caps.py
+      - python tools/ci/idf_build_apps_dump_soc_caps.py base.json
+      - diff new.json base.json
+
+build_docker:
+  extends:
+    - .before_script:minimal
+    - .rules:build:docker
+  stage: host_test
+  needs: []
+  image: espressif/docker-builder:1
+  tags: [shiny, dind]
+  variables:
+    DOCKER_TMP_IMAGE_NAME: "idf_tmp_image"
+  script:
+    - export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA} --build-arg IDF_CLONE_SHALLOW=1 --build-arg IDF_GITHUB_ASSETS=${INTERNAL_GITHUB_ASSETS}"
+    - docker build --tag ${DOCKER_TMP_IMAGE_NAME} ${DOCKER_BUILD_ARGS} tools/docker/
+    # We can't mount $PWD/examples/get-started/blink into the container, see https://gitlab.com/gitlab-org/gitlab-ce/issues/41227.
+    # The workaround mentioned there works, but leaves around directories which need to be cleaned up manually.
+    # Therefore, build a copy of the example located inside the container.
+    - docker run --rm --workdir /opt/esp/idf/examples/get-started/blink ${DOCKER_TMP_IMAGE_NAME} idf.py build
+
+############################
+# Host test with test apps #
+############################
 test_pytest_qemu:
   extends:
     - .host_test_template
@@ -344,50 +413,116 @@ test_pytest_macos:
       --junitxml=XUNIT_RESULT.xml
       --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
-test_idf_build_apps_load_soc_caps:
-  extends: .host_test_template
-  script:
-    - python tools/ci/check_soc_headers_load_in_idf_build_apps.py
-
-test_nvs_gen_check:
-  extends: .host_test_template
+######################
+# Build System Tests #
+######################
+.test_build_system_template:
+  stage: host_test
+  extends:
+    - .build_template
+    - .rules:build:check
+  dependencies: # set dependencies to null to avoid missing artifacts issue
+  needs:
+    - job: fast_template_app
+      artifacts: false
+      optional: true
   artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - components/nvs_flash/nvs_partition_tool
     reports:
       junit: XUNIT_RESULT.xml
+    paths:
+      - XUNIT_RESULT.xml
+      - test_build_system
+    expire_in: 1 week
+    when: always
+  script:
+    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
+    - cd ${IDF_PATH}/tools/test_build_system
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest
+      --cleanup-idf-copy
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+      --work-dir ${CI_PROJECT_DIR}/test_build_system
+      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
+      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
+
+.test_build_system_minimal_cmake_template:
+  extends: .test_build_system_template
   variables:
-    LC_ALL: C.UTF-8
+    INSTALL_EXTRA_TOOLS: cmake@3.22.1
   script:
-    - cd ${IDF_PATH}/components/nvs_flash/nvs_partition_tool
-    - pytest --noconftest test_nvs_gen_check.py --junitxml=XUNIT_RESULT.xml
+    - MINIMAL_SUPPORTED_CMAKE_VERSION=$(echo "${INSTALL_EXTRA_TOOLS}" | sed -n 's/.*cmake@\([0-9.]*\).*/\1/p')
+    - export PATH=$(echo "$PATH" | sed -E "s|/tools/cmake/[0-9.]+|/tools/cmake/${MINIMAL_SUPPORTED_CMAKE_VERSION}|")
+    - ACTUAL_CMAKE_VERSION=$(cmake --version | head -n1 | awk '{print $3}')
+    - |
+      if [ "${ACTUAL_CMAKE_VERSION}" != "${MINIMAL_SUPPORTED_CMAKE_VERSION}" ]; then
+        echo "ERROR: Wrong minimal CMake version! Detected: ${ACTUAL_CMAKE_VERSION}, but should be: ${MINIMAL_SUPPORTED_CMAKE_VERSION}"
+        exit 1
+      fi
+    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
+    - cd ${IDF_PATH}/tools/test_build_system
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest
+      -k cmake
+      --cleanup-idf-copy
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+      --work-dir ${CI_PROJECT_DIR}/test_build_system
+      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
+      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
 
-test_esp_rom:
-  extends: .host_test_template
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-    reports:
-      junit: XUNIT_RESULT.xml
+pytest_build_system:
+  extends: .test_build_system_template
+  parallel: 3
+
+pytest_buildv2_system:
+  extends:
+    - .test_build_system_template
+    - .rules:labels:buildv2
+  parallel: 3
   script:
-    - cd ${IDF_PATH}/components/esp_rom/
-    - pytest --noconftest test_esp_rom.py --junitxml=XUNIT_RESULT.xml
+    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
+    - cd ${IDF_PATH}/tools/test_build_system
+    - run_cmd idf-ci gitlab download-known-failure-cases-file ${KNOWN_FAILURE_CASES_FILE_NAME}
+    - pytest
+      --buildv2
+      --cleanup-idf-copy
+      --parallel-count ${CI_NODE_TOTAL:-1}
+      --parallel-index ${CI_NODE_INDEX:-1}
+      --work-dir ${CI_PROJECT_DIR}/test_build_system
+      --junitxml ${CI_PROJECT_DIR}/XUNIT_RESULT.xml
+      --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}
+      --
+      test_non_default_target.py
+      test_component_manager.py
+      test_build.py
+      test_bootloader.py
+      test_git.py
+      test_kconfig.py
+      test_partition.py
+      test_reproducible_build.py
+      test_sdkconfig.py
+      test_versions.py
+      test_common.py
+      test_components.py
+      test_cmake.py
+      test_idf_extension.py
+      test_rebuild.py
 
-make_sure_soc_caps_compatible_in_idf_build_apps:
-    extends:
-      - .host_test_template
-      - .rules:dev-push
-    artifacts:
-      paths:
-        - new.json
-        - base.json
-      when: always
-    when: manual
-    script:
-      - python tools/ci/idf_build_apps_dump_soc_caps.py new.json
-      - git fetch --depth=1 origin $CI_MERGE_REQUEST_DIFF_BASE_SHA
-      - git checkout -f $CI_MERGE_REQUEST_DIFF_BASE_SHA
-      - git checkout $CI_COMMIT_SHA -- tools/ci/idf_build_apps_dump_soc_caps.py
-      - python tools/ci/idf_build_apps_dump_soc_caps.py base.json
-      - diff new.json base.json
+pytest_build_system_macos:
+  extends:
+    - .test_build_system_template
+    - .brew-macos-settings
+    - .rules:build:macos
+  parallel: 3
+
+pytest_build_system_minimal_cmake:
+  extends: .test_build_system_minimal_cmake_template
+
+pytest_build_system_macos_minimal_cmake:
+  extends:
+    - .test_build_system_minimal_cmake_template
+    - .brew-macos-settings
+    - .rules:build:macos
+  variables:
+    INSTALL_EXTRA_TOOLS: ninja cmake@3.22.1

From accfcc96f4e66e03750e92c8c9dd7409a4b4b603 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Fri, 7 Nov 2025 13:24:07 +0100
Subject: [PATCH 10/10] ci: move host test unittest jobs to pytest

---
 .gitlab/ci/host-test.yml                      | 66 ++++++-------------
 .gitlab/ci/rules.yml                          |  2 +
 ...est_soc_headers_load_in_idf_build_apps.py} |  3 +-
 tools/ci/utils.sh                             | 19 ++++++
 4 files changed, 44 insertions(+), 46 deletions(-)
 rename tools/ci/{check_soc_headers_load_in_idf_build_apps.py => test_soc_headers_load_in_idf_build_apps.py} (89%)

diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml
index 58b990448a..e328c7d659 100644
--- a/.gitlab/ci/host-test.yml
+++ b/.gitlab/ci/host-test.yml
@@ -6,13 +6,16 @@
   dependencies: # set dependencies to null to avoid missing artifacts issue
   # run host_test jobs immediately, only after upload cache
   needs:
+    - pipeline_variables
     - job: upload-pip-cache
       optional: true
       artifacts: false
     - job: upload-submodules-cache
       optional: true
       artifacts: false
-    - pipeline_variables
+    - job: fast_template_app
+      optional: true
+      artifacts: false
   artifacts:
     expire_in: 1 week
     when: always
@@ -52,14 +55,14 @@ test_partition_table_on_host:
   extends: .host_test_template
   script:
     - cd components/partition_table/test_gen_esp32part_host
-    - ./gen_esp32part_tests.py
+    - pytest_for_ut ./gen_esp32part_tests.py
 
 test_ldgen_on_host:
   extends: .host_test_template
   script:
     - cd tools/ldgen/test
     - export PYTHONPATH=$PYTHONPATH:..
-    - python -m unittest
+    - pytest_for_ut .
   variables:
     LC_ALL: C.UTF-8
 
@@ -67,21 +70,19 @@ test_spiffs_on_host:
   extends: .host_test_template
   script:
     - cd components/spiffs/test_spiffsgen/
-    - ./test_spiffsgen.py
+    - pytest_for_ut ./test_spiffsgen.py
 
 test_fatfsgen_on_host:
   extends: .host_test_template
   script:
     - cd components/fatfs/test_fatfsgen/
-    - ./test_fatfsgen.py
-    - ./test_wl_fatfsgen.py
-    - ./test_fatfsparse.py
+    - pytest_for_ut ./test_fatfsgen.py ./test_wl_fatfsgen.py ./test_fatfsparse.py
 
 test_certificate_bundle_on_host:
   extends: .host_test_template
   script:
     - cd components/mbedtls/esp_crt_bundle/test_gen_crt_bundle/
-    - ./test_gen_crt_bundle.py
+    - pytest_for_ut ./test_gen_crt_bundle.py
 
 # Test for create virtualenv. It must be invoked from Python, not from virtualenv.
 # Use docker image system python without any extra dependencies
@@ -104,15 +105,17 @@ test_cli_installer:
     - python3 ${IDF_PATH}/tools/idf_tools.py download required qemu-riscv32 qemu-xtensa cmake cmake@3.22.1
     - cd ${IDF_PATH}/tools/test_idf_tools
     - python3 -m pip install jsonschema
+    # Testing with system python3, so don't use any third-party packages
     - python3 ./test_idf_tools.py -v
     - python3 ./test_idf_tools_python_env.py
     # It runs at the end because it modifies dependencies
     - IDF_TEST_MAY_BREAK_DEPENDENCIES=1 python3 ./test_idf_tools.py -v TestSystemDependencies.test_commands_when_nodeps
 
-.test_efuse_table_on_host_template:
+test_efuse_table_on_host:
   extends: .host_test_template
-  variables:
-    IDF_TARGET: "esp32"
+  parallel:
+    matrix:
+      - IDF_TARGET: [esp32, esp32s2, esp32c3, esp32s3, esp32c2, esp32c6, esp32h2, esp32p4, esp32c5, esp32c61]
   artifacts:
     when: on_failure
     paths:
@@ -122,35 +125,7 @@ test_cli_installer:
     - ./efuse_table_gen.py -t "${IDF_TARGET}" ${IDF_PATH}/components/efuse/${IDF_TARGET}/esp_efuse_table.csv
     - git diff --exit-code -- ${IDF_TARGET}/esp_efuse_table.c || { echo 'Differences found for ${IDF_TARGET} target. Please run idf.py efuse-common-table and commit the changes.'; exit 1; }
     - cd ${IDF_PATH}/components/efuse/test_efuse_host
-    - ./efuse_tests.py
-
-test_efuse_table_on_host_esp32:
-  extends: .test_efuse_table_on_host_template
-
-test_efuse_table_on_host_esp32s2:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32s2
-
-test_efuse_table_on_host_esp32s3:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32s3
-
-test_efuse_table_on_host_esp32c3:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32c3
-
-test_efuse_table_on_host_esp32h2:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32h2
-
-test_efuse_table_on_host_esp32c6:
-  extends: .test_efuse_table_on_host_template
-  variables:
-    IDF_TARGET: esp32c6
+    - pytest_for_ut ./efuse_tests.py
 
 test_logtrace_proc:
   extends: .host_test_template
@@ -217,7 +192,7 @@ test_split_path_by_spaces:
   extends: .host_test_template
   script:
     - cd ${IDF_PATH}/tools
-    - python -m unittest split_paths_by_spaces.py
+    - pytest_for_ut ./split_paths_by_spaces.py
 
 test_transport_on_host:
   extends: .host_test_template
@@ -256,12 +231,13 @@ test_gen_soc_caps_kconfig:
   extends: .host_test_template
   script:
     - cd ${IDF_PATH}/tools/gen_soc_caps_kconfig/
-    - ./test/test_gen_soc_caps_kconfig.py
+    - pytest_for_ut ./test/test_gen_soc_caps_kconfig.py
 
 test_idf_build_apps_load_soc_caps:
   extends: .host_test_template
   script:
-    - python tools/ci/check_soc_headers_load_in_idf_build_apps.py
+    - cd tools/ci
+    - pytest_for_ut ./test_soc_headers_load_in_idf_build_apps.py
 
 test_nvs_gen_check:
   extends: .host_test_template
@@ -275,7 +251,7 @@ test_nvs_gen_check:
     LC_ALL: C.UTF-8
   script:
     - cd ${IDF_PATH}/components/nvs_flash/nvs_partition_tool
-    - pytest --noconftest test_nvs_gen_check.py --junitxml=XUNIT_RESULT.xml
+    - pytest_for_ut test_nvs_gen_check.py
 
 test_esp_rom:
   extends: .host_test_template
@@ -286,7 +262,7 @@ test_esp_rom:
       junit: XUNIT_RESULT.xml
   script:
     - cd ${IDF_PATH}/components/esp_rom/
-    - pytest --noconftest test_esp_rom.py --junitxml=XUNIT_RESULT.xml
+    - pytest_for_ut test_esp_rom.py
 
 make_sure_soc_caps_compatible_in_idf_build_apps:
     extends:
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 7277a94d79..ea1d3b9ce6 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -129,6 +129,8 @@
   - "tools/bsasm.py"
   - "tools/test_bsasm/**/*"
 
+  - "tools/ci/test_soc_headers_load_in_idf_build_apps.py"
+
 .patterns-docker: &patterns-docker
   - "tools/docker/**/*"
 
diff --git a/tools/ci/check_soc_headers_load_in_idf_build_apps.py b/tools/ci/test_soc_headers_load_in_idf_build_apps.py
similarity index 89%
rename from tools/ci/check_soc_headers_load_in_idf_build_apps.py
rename to tools/ci/test_soc_headers_load_in_idf_build_apps.py
index ffbc134160..5c7de8e0a2 100644
--- a/tools/ci/check_soc_headers_load_in_idf_build_apps.py
+++ b/tools/ci/test_soc_headers_load_in_idf_build_apps.py
@@ -13,7 +13,8 @@ class TestLoadSocHeaders(unittest.TestCase):
     def test_targets(self) -> None:
         sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
-        from idf_py_actions.constants import PREVIEW_TARGETS, SUPPORTED_TARGETS
+        from idf_py_actions.constants import PREVIEW_TARGETS
+        from idf_py_actions.constants import SUPPORTED_TARGETS
 
         self.assertEqual(IBA_PREVIEW_TARGETS, PREVIEW_TARGETS)
         self.assertEqual(IBA_SUPPORTED_TARGETS, SUPPORTED_TARGETS)
diff --git a/tools/ci/utils.sh b/tools/ci/utils.sh
index 17951e2173..5d5fef4202 100644
--- a/tools/ci/utils.sh
+++ b/tools/ci/utils.sh
@@ -96,6 +96,25 @@ function run_cmd() {
   fi
 }
 
+function pytest_for_ut() {
+  pytest_args="-c NUL -p no:idf-ci -p no:pytest_embedded"
+
+  if [ -n "${CI_JOB_ID-}" ]; then
+    if [ -z "${KNOWN_FAILURE_CASES_FILE_NAME-}" ]; then
+      echo "Error: KNOWN_FAILURE_CASES_FILE_NAME is not set."
+      return 1
+    fi
+
+    pytest_args="${pytest_args} --junitxml XUNIT_RESULT_${CI_JOB_ID}.xml --ignore-result-files ${KNOWN_FAILURE_CASES_FILE_NAME}"
+
+    if [ ! -e "${KNOWN_FAILURE_CASES_FILE_NAME}" ]; then
+      run_cmd idf-ci gitlab download-known-failure-cases-file "${KNOWN_FAILURE_CASES_FILE_NAME}"
+    fi
+  fi
+
+  run_cmd pytest "$@" "${pytest_args}"
+}
+
 # Retries a command RETRY_ATTEMPTS times in case of failure
 # Inspired by https://stackoverflow.com/a/8351489
 function retry_failed() {