ci(ulp): re-enable legacy ULP buildv2 jobs

components/esp_hal_security/.build-test-rules.yml

@@ -8,8 +8,5 @@ components/esp_hal_security/test_apps/crypto:
     - esp_security
 
 components/esp_hal_security/test_apps/tee:
-  disable+:
-    - if: IDF_BUILD_V2 == "1"
-      reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
   disable:
     - if: IDF_TARGET not in ["esp32c6", "esp32h2", "esp32c5", "esp32c61", "esp32p4"]

components/esp_hw_support/test_apps/.build-test-rules.yml

@@ -103,8 +103,6 @@ components/esp_hw_support/test_apps/vad_wakeup:
     - ulp
     - soc
   disable:
-    - if: IDF_BUILD_V2 == "1"
-      reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
     - if: SOC_LP_VAD_SUPPORTED != 1
 
 components/esp_hw_support/test_apps/wakeup_tests:

components/esp_pm/test_apps/esp_pm/main/CMakeLists.txt

@@ -14,5 +14,4 @@ endif()
 idf_component_register(SRCS ${sources}
                        INCLUDE_DIRS "."
                        PRIV_REQUIRES unity esp_pm ulp esp_timer esp_psram esp_driver_gptimer vfs esp_hal_gpio
-                                     esp_driver_gpio
                        WHOLE_ARCHIVE)

components/ulp/test_apps/.build-test-rules.yml

@@ -1,12 +1,6 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
-.ulp_legacy_buildv2_disable: &ulp_legacy_buildv2_disable
-  if: IDF_BUILD_V2 == "1"
-  reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
-
 components/ulp/test_apps/lp_core/lp_core_basic_tests:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_LP_CORE_SUPPORTED != 1
     - if: CONFIG_NAME == "xtal" and SOC_CLK_LP_FAST_SUPPORT_XTAL != 1
@@ -26,8 +20,6 @@ components/ulp/test_apps/lp_core/lp_core_basic_tests:
 
 
 components/ulp/test_apps/lp_core/lp_core_gpio_wakeup_tests:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: (SOC_LP_CORE_SUPPORTED == 1) and (SOC_RTCIO_PIN_COUNT > 0) and (SOC_DEEP_SLEEP_SUPPORTED == 1) and (SOC_RTC_GPIO_EDGE_WAKEUP_SUPPORTED == 1)
   depends_components:
@@ -39,8 +31,6 @@ components/ulp/test_apps/lp_core/lp_core_gpio_wakeup_tests:
 
 
 components/ulp/test_apps/lp_core/lp_core_hp_mem:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_LP_CORE_SUPPORTED != 1
   depends_components:
@@ -51,8 +41,6 @@ components/ulp/test_apps/lp_core/lp_core_hp_mem:
 
 
 components/ulp/test_apps/lp_core/lp_core_hp_uart:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_LP_CORE_SUPPORTED != 1
   depends_components:
@@ -63,8 +51,6 @@ components/ulp/test_apps/lp_core/lp_core_hp_uart:
 
 
 components/ulp/test_apps/ulp_fsm:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_ULP_FSM_SUPPORTED == 1
   depends_components:
@@ -75,8 +61,6 @@ components/ulp/test_apps/ulp_fsm:
 
 
 components/ulp/test_apps/ulp_riscv:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_RISCV_COPROC_SUPPORTED != 1
   depends_components:

examples/system/ulp/.build-test-rules.yml

@@ -6,20 +6,12 @@
     - esp_hw_support
     - esp_hal_pmu
 
-.ulp_legacy_buildv2_disable: &ulp_legacy_buildv2_disable
-  if: IDF_BUILD_V2 == "1"
-  reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
-
 examples/system/ulp/lp_core/build_system:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORTED == 1
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/debugging:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORTED == 1
   disable_test:
@@ -29,8 +21,6 @@ examples/system/ulp/lp_core/debugging:
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/gpio:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_DEEP_SLEEP_SUPPORTED != 1
   enable:
@@ -40,8 +30,6 @@ examples/system/ulp/lp_core/gpio:
     - esp_hal_gpio
 
 examples/system/ulp/lp_core/gpio_intr_pulse_counter:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: (SOC_LP_CORE_SUPPORTED == 1) and (SOC_ULP_LP_UART_SUPPORTED == 1 and SOC_DEEP_SLEEP_SUPPORTED == 1)
   <<: *ulp_default_depends
@@ -49,8 +37,6 @@ examples/system/ulp/lp_core/gpio_intr_pulse_counter:
     - esp_hal_gpio
 
 examples/system/ulp/lp_core/gpio_wakeup:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: (SOC_LP_CORE_SUPPORTED == 1) and (SOC_RTCIO_PIN_COUNT > 0) and (SOC_DEEP_SLEEP_SUPPORTED == 1) and (SOC_RTC_GPIO_EDGE_WAKEUP_SUPPORTED == 1) # TODO: [ESP32S31] IDF-15884 SOC_RTC_GPIO_EDGE_WAKEUP_SUPPORTED not declared yet
   <<: *ulp_default_depends
@@ -59,22 +45,16 @@ examples/system/ulp/lp_core/gpio_wakeup:
     - esp_hal_gpio
 
 examples/system/ulp/lp_core/inter_cpu_critical_section/:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORTED == 1
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/interrupt:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORTED == 1
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/lp_adc:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: (SOC_LP_ADC_SUPPORTED != 1)
   <<: *ulp_default_depends
@@ -84,8 +64,6 @@ examples/system/ulp/lp_core/lp_adc:
     - esp_hal_uart
 
 examples/system/ulp/lp_core/lp_i2c:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORT_I2C == 1 and (SOC_DEEP_SLEEP_SUPPORTED == 1 and SOC_LP_CORE_SUPPORTED == 1)
   <<: *ulp_default_depends
@@ -93,15 +71,11 @@ examples/system/ulp/lp_core/lp_i2c:
     - esp_hal_i2c
 
 examples/system/ulp/lp_core/lp_mailbox:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_CORE_SUPPORTED == 1
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/lp_spi:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_LP_SPI_SUPPORTED == 1 and SOC_DEEP_SLEEP_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -109,15 +83,11 @@ examples/system/ulp/lp_core/lp_spi:
     - esp_hal_gpspi
 
 examples/system/ulp/lp_core/lp_timer_interrupt:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: (SOC_LP_CORE_SUPPORTED != 1) or (SOC_LP_TIMER_SUPPORTED != 1)
   <<: *ulp_default_depends
 
 examples/system/ulp/lp_core/lp_touch:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_TOUCH_SENSOR_SUPPORTED == 1 and (SOC_DEEP_SLEEP_SUPPORTED == 1 and SOC_LP_CORE_SUPPORTED == 1)
   <<: *ulp_default_depends
@@ -126,8 +96,6 @@ examples/system/ulp/lp_core/lp_touch:
     - esp_hal_touch_sens
 
 examples/system/ulp/lp_core/lp_uart/lp_uart_char_seq_wakeup:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: (SOC_ULP_LP_UART_SUPPORTED != 1) or (SOC_DEEP_SLEEP_SUPPORTED != 1)
   <<: *ulp_default_depends
@@ -135,8 +103,6 @@ examples/system/ulp/lp_core/lp_uart/lp_uart_char_seq_wakeup:
     - esp_hal_uart
 
 examples/system/ulp/lp_core/lp_uart/lp_uart_echo:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: (SOC_ULP_LP_UART_SUPPORTED != 1) or (SOC_DEEP_SLEEP_SUPPORTED != 1)
   <<: *ulp_default_depends
@@ -144,8 +110,6 @@ examples/system/ulp/lp_core/lp_uart/lp_uart_echo:
     - esp_hal_uart
 
 examples/system/ulp/lp_core/lp_uart/lp_uart_print:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: (SOC_ULP_LP_UART_SUPPORTED != 1) or (SOC_DEEP_SLEEP_SUPPORTED != 1)
   <<: *ulp_default_depends
@@ -153,15 +117,11 @@ examples/system/ulp/lp_core/lp_uart/lp_uart_print:
     - esp_hal_uart
 
 examples/system/ulp/ulp_fsm/ulp:
-  disable+:
-    - *ulp_legacy_buildv2_disable
   disable:
     - if: SOC_ULP_FSM_SUPPORTED != 1
   <<: *ulp_default_depends
 
 examples/system/ulp/ulp_fsm/ulp_adc:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: IDF_TARGET in ["esp32", "esp32s3"]
       temporary: true
@@ -172,8 +132,6 @@ examples/system/ulp/ulp_fsm/ulp_adc:
     - esp_hal_ana_conv
 
 examples/system/ulp/ulp_riscv/adc:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -182,8 +140,6 @@ examples/system/ulp/ulp_riscv/adc:
     - esp_hal_ana_conv
 
 examples/system/ulp/ulp_riscv/ds18b20_onewire:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: IDF_TARGET == "esp32s2"
       temporary: true
@@ -193,8 +149,6 @@ examples/system/ulp/ulp_riscv/ds18b20_onewire:
     - esp_hal_gpio
 
 examples/system/ulp/ulp_riscv/gpio:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -202,8 +156,6 @@ examples/system/ulp/ulp_riscv/gpio:
     - esp_hal_gpio
 
 examples/system/ulp/ulp_riscv/gpio_interrupt:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -212,8 +164,6 @@ examples/system/ulp/ulp_riscv/gpio_interrupt:
     - esp_hal_gpio
 
 examples/system/ulp/ulp_riscv/gpio_pulse_counter:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -221,8 +171,6 @@ examples/system/ulp/ulp_riscv/gpio_pulse_counter:
     - esp_hal_gpio
 
 examples/system/ulp/ulp_riscv/i2c:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -230,15 +178,11 @@ examples/system/ulp/ulp_riscv/i2c:
     - esp_hal_i2c
 
 examples/system/ulp/ulp_riscv/interrupts:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
 
 examples/system/ulp/ulp_riscv/touch:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends
@@ -247,8 +191,6 @@ examples/system/ulp/ulp_riscv/touch:
     - esp_hal_touch_sens
 
 examples/system/ulp/ulp_riscv/uart_print:
-  disable:
-    - *ulp_legacy_buildv2_disable
   enable:
     - if: SOC_RISCV_COPROC_SUPPORTED == 1
   <<: *ulp_default_depends

examples/system/ulp/ulp_fsm_riscv_combined/counter/.build-test-rules.yml

@@ -1,7 +1,4 @@
 examples/system/ulp/ulp_fsm_riscv_combined/counter:
-  disable:
-    - if: IDF_BUILD_V2 == "1"
-      reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
   enable:
     - if: SOC_ULP_FSM_SUPPORTED == 1 and SOC_RISCV_COPROC_SUPPORTED == 1 and IDF_TARGET in ["esp32s2", "esp32s3"]
       temporary: false

tools/ci/dynamic_pipelines/scripts/patch_buildv2_child_pipeline.py

@@ -6,8 +6,8 @@ The buildv2 build child pipeline is generated by ``idf-ci gitlab build-child-pip
 from the same manifest as the default pipeline. This script post-processes that
 generated YAML so the cmakev2 path is exercised end to end:
 
-1. Point child build jobs at the buildv2 generator artifacts, then inject
+1. Inject ``IDF_BUILD_V2`` into each child build job so cmake activates the
-   ``IDF_BUILD_V2`` so cmake activates the cmakev2 shim.
+   cmakev2 shim.
 
 2. Inject ``PIPELINE_COMMIT_SHA: ${PIPELINE_COMMIT_SHA}_buildv2`` into each child
    build job. idf-ci reads ``PIPELINE_COMMIT_SHA`` when computing the s3
@@ -27,13 +27,6 @@ import argparse
 import yaml
 
 PIPELINE_COMMIT_SHA_V2 = '${PIPELINE_COMMIT_SHA}_buildv2'
-BUILDV2_GENERATOR_JOB = 'generate_build_child_pipeline_buildv2'
-
-
-def _use_buildv2_generator_artifacts(job: dict) -> None:
-    for need in job.get('needs', []):
-        if isinstance(need, dict) and need.get('job') == 'generate_build_child_pipeline':
-            need['job'] = BUILDV2_GENERATOR_JOB
 
 
 def patch(path: str) -> None:
@@ -43,7 +36,6 @@ def patch(path: str) -> None:
     injected = []
     for k, v in d.items():
         if isinstance(v, dict) and 'extends' in v:
-            _use_buildv2_generator_artifacts(v)
             v.setdefault('variables', {})['IDF_BUILD_V2'] = '1'
             v['variables']['PIPELINE_COMMIT_SHA'] = PIPELINE_COMMIT_SHA_V2
             injected.append(k)

tools/test_apps/system/.build-test-rules.yml

@@ -194,9 +194,6 @@ tools/test_apps/system/ram_loadable_app:
       reason: cannot pass # TODO: IDF-15525
 
 tools/test_apps/system/rtc_mem_reserve:
-  disable:
-    - if: IDF_BUILD_V2 == "1"
-      reason: Legacy ULP apps are covered by CMake v1; buildv2 covers full_subproject ULP apps.
   enable:
     - if: IDF_TARGET in ["esp32p4"]
       reason: only P4 has a potential conflict due to using rtc mem for lp rom data/stack