From 21430acb4fd74e977548c059239bde290d5723b4 Mon Sep 17 00:00:00 2001
From: Frantisek Hrbata <frantisek.hrbata@espressif.com>
Date: Mon, 11 Aug 2025 08:45:17 +0200
Subject: [PATCH] ci(cmakev2): enable buildv2 CI testing

A new pytest_buildv2_system job has been added to execute selected tests
from the existing test_build_system test suite. Currently, only the
test_non_default_target.py is enabled. The ultimate goal is to run most
of the build system tests with buildv2. This should help ensure
compatibility between IDF build system v1 and v2.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
---
 .gitlab/ci/build.yml                   | 18 ++++++++++++++++++
 .gitlab/ci/rules.yml                   |  1 +
 tools/ci/exclude_check_tools_files.txt |  1 -
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 2dcf6f735f9..f273e4c0ff2 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -255,6 +255,24 @@ pytest_build_system:
   extends: .test_build_system_template
   parallel: 3
 
+pytest_buildv2_system:
+  extends: .test_build_system_template
+  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
+
 pytest_build_system_macos:
   extends:
     - .test_build_system_template
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index ba0d32658aa..df41ec41991 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -46,6 +46,7 @@
 
 .patterns-build_system: &patterns-build_system
   - "tools/cmake/**/*"
+  - "tools/cmakev2/**/*"
   - "tools/kconfig_new/**/*"
   - "tools/idf.py"
   - "tools/idf_py_actions/**/*"
diff --git a/tools/ci/exclude_check_tools_files.txt b/tools/ci/exclude_check_tools_files.txt
index 94f3a45bace..5ccf75a904a 100644
--- a/tools/ci/exclude_check_tools_files.txt
+++ b/tools/ci/exclude_check_tools_files.txt
@@ -40,7 +40,6 @@ tools/ci/python_packages/wifi_tools.py
 tools/ci/sg_rules/*
 tools/ci/sort_yaml.py
 tools/ci/utils.sh
-tools/cmakev2/**/*
 tools/eclipse-code-style.xml
 tools/format.sh
 tools/gdb_panic_server.py