ci: rename target test jobs names

.gitlab-ci.yml

@@ -150,7 +150,7 @@ cache:
   # target test jobs
   if [[ "${CI_JOB_STAGE}" == "target_test" ]]; then
     # ttfw jobs
-    if ! echo "${CI_JOB_NAME}" | egrep ".+_pytest_.+"; then
+    if ! echo "${CI_JOB_NAME}" | egrep ".*pytest.*"; then
       run_cmd bash install.sh --enable-ci --enable-ttfw
     else
       run_cmd bash install.sh --enable-ci --enable-pytest
@@ -160,7 +160,7 @@ cache:
   elif [[ "${CI_JOB_STAGE}" == "build" ]]; then
     run_cmd bash install.sh --enable-ci --enable-pytest
   else
-    if ! echo "${CI_JOB_NAME}" | egrep ".+_pytest_.+"; then
+    if ! echo "${CI_JOB_NAME}" | egrep ".*pytest.*"; then
       run_cmd bash install.sh --enable-ci
     else
       run_cmd bash install.sh --enable-ci --enable-pytest

.gitlab/ci/target-test.yml

@@ -45,7 +45,7 @@
   variables:
     TEST_DIR: examples
 
-example_test_pytest_esp32_generic:
+pytest_examples_esp32_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -54,7 +54,7 @@ example_test_pytest_esp32_generic:
   tags: [ esp32, generic ]
   parallel: 3
 
-example_test_pytest_esp32_esp32eco3:
+pytest_examples_esp32_esp32eco3:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -62,7 +62,7 @@ example_test_pytest_esp32_esp32eco3:
     - build_pytest_examples_esp32
   tags: [ esp32, esp32eco3 ]
 
-example_test_pytest_esp32_ir_transceiver:
+pytest_examples_esp32_ir_transceiver:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -70,7 +70,7 @@ example_test_pytest_esp32_ir_transceiver:
     - build_pytest_examples_esp32
   tags: [ esp32, ir_transceiver ]
 
-example_test_pytest_esp32_twai_transceiver:
+pytest_examples_esp32_twai_transceiver:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -78,7 +78,7 @@ example_test_pytest_esp32_twai_transceiver:
     - build_pytest_examples_esp32
   tags: [ esp32, twai_transceiver ]
 
-example_test_pytest_esp32_twai_network:
+pytest_examples_esp32_twai_network:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -86,7 +86,7 @@ example_test_pytest_esp32_twai_network:
     - build_pytest_examples_esp32
   tags: [ esp32, twai_network ]
 
-example_test_pytest_esp32_jtag:
+pytest_examples_esp32_jtag:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -97,7 +97,7 @@ example_test_pytest_esp32_jtag:
     SETUP_TOOLS: "1"  # need gdb openocd
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-example_test_pytest_esp32s2_generic:
+pytest_examples_esp32s2_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s2
@@ -106,7 +106,7 @@ example_test_pytest_esp32s2_generic:
   tags: [ esp32s2, generic ]
   parallel: 3
 
-example_test_pytest_esp32s2_jtag:
+pytest_examples_esp32s2_jtag:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s2
@@ -117,7 +117,7 @@ example_test_pytest_esp32s2_jtag:
     SETUP_TOOLS: "1"  # need gdb openocd
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-example_test_pytest_esp32s3_generic:
+pytest_examples_esp32s3_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3
@@ -126,7 +126,7 @@ example_test_pytest_esp32s3_generic:
   tags: [ esp32s3, generic ]
   parallel: 3
 
-example_test_pytest_esp32s3_usb_serial_jtag:
+pytest_examples_esp32s3_usb_serial_jtag:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3
@@ -137,7 +137,7 @@ example_test_pytest_esp32s3_usb_serial_jtag:
     SETUP_TOOLS: "1"  # need gdb openocd
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-example_test_pytest_esp32s3_f4r8:
+pytest_examples_esp32s3_f4r8:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3
@@ -145,7 +145,7 @@ example_test_pytest_esp32s3_f4r8:
     - build_pytest_examples_esp32s3
   tags: [ esp32s3, MSPI_F4R8 ]
 
-example_test_pytest_esp32c2_generic:
+pytest_examples_esp32c2_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c2
@@ -154,7 +154,7 @@ example_test_pytest_esp32c2_generic:
   tags: [ esp32c2, generic, xtal_40mhz ]
   parallel: 3
 
-example_test_pytest_esp32c2_jtag:
+pytest_examples_esp32c2_jtag:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c2
@@ -165,7 +165,7 @@ example_test_pytest_esp32c2_jtag:
     SETUP_TOOLS: "1"  # need gdb openocd
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-example_test_pytest_esp32c3_generic:
+pytest_examples_esp32c3_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3
@@ -174,7 +174,7 @@ example_test_pytest_esp32c3_generic:
   tags: [ esp32c3, generic ]
   parallel: 3
 
-example_test_pytest_esp32c3_usb_serial_jtag:
+pytest_examples_esp32c3_usb_serial_jtag:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3
@@ -185,7 +185,7 @@ example_test_pytest_esp32c3_usb_serial_jtag:
     SETUP_TOOLS: "1"  # need gdb openocd
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-example_test_pytest_esp32c3_flash_suspend:
+pytest_examples_esp32c3_flash_suspend:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3
@@ -193,7 +193,7 @@ example_test_pytest_esp32c3_flash_suspend:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, flash_suspend ]
 
-example_test_pytest_esp32c6_generic:
+pytest_examples_esp32c6_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c6
@@ -201,7 +201,7 @@ example_test_pytest_esp32c6_generic:
     - build_pytest_examples_esp32c6
   tags: [ esp32c6, generic ]
 
-example_test_pytest_esp32h2_generic:
+pytest_examples_esp32h2_generic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32h2
@@ -209,7 +209,7 @@ example_test_pytest_esp32h2_generic:
     - build_pytest_examples_esp32h2
   tags: [ esp32h2, generic ]
 
-example_test_pytest_esp32_ethernet_ota:
+pytest_examples_esp32_ethernet_ota:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-ethernet
@@ -217,7 +217,7 @@ example_test_pytest_esp32_ethernet_ota:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet_ota ]
 
-example_test_pytest_esp32_wifi_high_traffic:
+pytest_examples_esp32_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -225,7 +225,7 @@ example_test_pytest_esp32_wifi_high_traffic:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_high_traffic ]
 
-example_test_pytest_esp32_flash_encryption_wifi_high_traffic:
+pytest_examples_esp32_flash_encryption_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-include_nightly_run-rule
@@ -233,7 +233,7 @@ example_test_pytest_esp32_flash_encryption_wifi_high_traffic:
     - build_pytest_examples_esp32
   tags: [ esp32, flash_encryption_wifi_high_traffic ]
 
-example_test_pytest_esp32c3_flash_encryption_wifi_high_traffic:
+pytest_examples_esp32c3_flash_encryption_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-include_nightly_run-rule
@@ -241,7 +241,7 @@ example_test_pytest_esp32c3_flash_encryption_wifi_high_traffic:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, flash_encryption_wifi_high_traffic ]
 
-example_test_pytest_esp32_ethernet:
+pytest_examples_esp32_ethernet:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-ethernet
@@ -249,7 +249,7 @@ example_test_pytest_esp32_ethernet:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet]
 
-example_test_pytest_esp32_8mb_flash:
+pytest_examples_esp32_8mb_flash:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -257,7 +257,7 @@ example_test_pytest_esp32_8mb_flash:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet_flash_8m ]
 
-example_test_pytest_esp32_wifi_ap:
+pytest_examples_esp32_wifi_ap:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -265,7 +265,7 @@ example_test_pytest_esp32_wifi_ap:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_ap ]
 
-example_test_pytest_esp32c3_wifi_ap:
+pytest_examples_esp32c3_wifi_ap:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-wifi
@@ -273,7 +273,7 @@ example_test_pytest_esp32c3_wifi_ap:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, wifi_ap ]
 
-example_test_pytest_esp32s3_wifi_ap:
+pytest_examples_esp32s3_wifi_ap:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3-wifi
@@ -281,7 +281,7 @@ example_test_pytest_esp32s3_wifi_ap:
     - build_pytest_examples_esp32s3
   tags: [ esp32s3, wifi_ap ]
 
-example_test_pytest_esp32_wifi_router:
+pytest_examples_esp32_wifi_router:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -289,7 +289,7 @@ example_test_pytest_esp32_wifi_router:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_router ]
 
-example_test_pytest_esp32c3_wifi_router:
+pytest_examples_esp32c3_wifi_router:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-wifi
@@ -297,14 +297,14 @@ example_test_pytest_esp32c3_wifi_router:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, wifi_router ]
 
-example_test_pytest_esp32s3_wifi_router:
+pytest_examples_esp32s3_wifi_router:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3-wifi
   needs:
     - build_pytest_examples_esp32s3
   tags: [ esp32s3, wifi_router ]
-example_test_pytest_esp32_wifi_iperf:
+pytest_examples_esp32_wifi_iperf:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -312,7 +312,7 @@ example_test_pytest_esp32_wifi_iperf:
     - build_pytest_examples_esp32
   tags: [ esp32, Example_ShieldBox_Basic ]
 
-example_test_pytest_esp32_wifi_wlan:
+pytest_examples_esp32_wifi_wlan:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -320,7 +320,7 @@ example_test_pytest_esp32_wifi_wlan:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_wlan ]
 
-example_test_pytest_esp32_ethernet_router:
+pytest_examples_esp32_ethernet_router:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-ethernet
@@ -328,7 +328,7 @@ example_test_pytest_esp32_ethernet_router:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet_router ]
 
-example_test_pytest_esp32_ethernet_ip101:
+pytest_examples_esp32_ethernet_ip101:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -336,7 +336,7 @@ example_test_pytest_esp32_ethernet_ip101:
     - build_pytest_examples_esp32
   tags: [ esp32, ip101 ]
 
-example_test_pytest_esp32_flash_encryption:
+pytest_examples_esp32_flash_encryption:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -344,7 +344,7 @@ example_test_pytest_esp32_flash_encryption:
     - build_pytest_examples_esp32
   tags: [ esp32, flash_encryption ]
 
-example_test_pytest_esp32_wifi_two_dut:
+pytest_examples_esp32_wifi_two_dut:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-wifi
@@ -352,7 +352,7 @@ example_test_pytest_esp32_wifi_two_dut:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_two_dut ]
 
-example_test_pytest_esp32c3_wifi_two_dut:
+pytest_examples_esp32c3_wifi_two_dut:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-wifi
@@ -360,7 +360,7 @@ example_test_pytest_esp32c3_wifi_two_dut:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, wifi_two_dut ]
 
-example_test_pytest_esp32s3_wifi_two_dut:
+pytest_examples_esp32s3_wifi_two_dut:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3-wifi
@@ -368,7 +368,7 @@ example_test_pytest_esp32s3_wifi_two_dut:
     - build_pytest_examples_esp32s3
   tags: [ esp32s3, wifi_two_dut ]
 
-example_test_pytest_esp32c2_wifi_two_dut:
+pytest_examples_esp32c2_wifi_two_dut:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c2-wifi
@@ -376,7 +376,7 @@ example_test_pytest_esp32c2_wifi_two_dut:
     - build_pytest_examples_esp32c2
   tags: [ esp32c2, wifi_two_dut, xtal_26mhz ]
 
-example_test_pytest_esp32c3_flash_encryption:
+pytest_examples_esp32c3_flash_encryption:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3
@@ -384,7 +384,7 @@ example_test_pytest_esp32c3_flash_encryption:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, flash_encryption ]
 
-example_test_pytest_esp32s2_usb_device:
+pytest_examples_esp32s2_usb_device:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s2-usb
@@ -392,7 +392,7 @@ example_test_pytest_esp32s2_usb_device:
     - build_pytest_examples_esp32s2
   tags: [ esp32s2, usb_device ]
 
-example_test_pytest_esp32_sdmmc:
+pytest_examples_esp32_sdmmc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -400,7 +400,7 @@ example_test_pytest_esp32_sdmmc:
     - build_pytest_examples_esp32
   tags: [ esp32, sdcard_sdmode ]
 
-example_test_pytest_esp32_sdspi:
+pytest_examples_esp32_sdspi:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-sdio
@@ -408,7 +408,7 @@ example_test_pytest_esp32_sdspi:
     - build_pytest_examples_esp32
   tags: [ esp32, sdcard_spimode ]
 
-example_test_pytest_esp32s2_sdspi:
+pytest_examples_esp32s2_sdspi:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s2-sdio
@@ -416,7 +416,7 @@ example_test_pytest_esp32s2_sdspi:
     - build_pytest_examples_esp32s2
   tags: [ esp32s2, sdcard_spimode ]
 
-example_test_pytest_esp32c3_sdspi:
+pytest_examples_esp32c3_sdspi:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-sdio
@@ -424,7 +424,7 @@ example_test_pytest_esp32c3_sdspi:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, sdcard_spimode ]
 
-example_test_pytest_esp32_extflash:
+pytest_examples_esp32_extflash:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32
@@ -432,7 +432,7 @@ example_test_pytest_esp32_extflash:
     - build_pytest_examples_esp32
   tags: [ esp32, external_flash ]
 
-example_test_pytest_esp32_adc:
+pytest_examples_esp32_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32-adc
@@ -440,7 +440,7 @@ example_test_pytest_esp32_adc:
     - build_pytest_examples_esp32
   tags: [ esp32, adc ]
 
-example_test_pytest_esp32s2_adc:
+pytest_examples_esp32s2_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s2-adc
@@ -448,7 +448,7 @@ example_test_pytest_esp32s2_adc:
     - build_pytest_examples_esp32s2
   tags: [ esp32s2, adc ]
 
-example_test_pytest_esp32s3_adc:
+pytest_examples_esp32s3_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32s3-adc
@@ -456,7 +456,7 @@ example_test_pytest_esp32s3_adc:
     - build_pytest_examples_esp32s3
   tags: [ esp32s3, adc ]
 
-example_test_pytest_esp32c3_adc:
+pytest_examples_esp32c3_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c3-adc
@@ -464,7 +464,7 @@ example_test_pytest_esp32c3_adc:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, adc ]
 
-example_test_pytest_esp32c2_adc:
+pytest_examples_esp32c2_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c2-adc
@@ -472,7 +472,7 @@ example_test_pytest_esp32c2_adc:
     - build_pytest_examples_esp32c2
   tags: [ esp32c2, adc, xtal_26mhz]
 
-example_test_pytest_esp32c6_adc:
+pytest_examples_esp32c6_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32c6-adc
@@ -480,7 +480,7 @@ example_test_pytest_esp32c6_adc:
     - build_pytest_examples_esp32c6
   tags: [ esp32c6, adc ]
 
-example_test_pytest_esp32h2_adc:
+pytest_examples_esp32h2_adc:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-esp32h2-adc
@@ -493,7 +493,7 @@ example_test_pytest_esp32h2_adc:
   variables:
     TEST_DIR: components
 
-component_ut_pytest_esp32_generic:
+pytest_components_esp32_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -502,7 +502,7 @@ component_ut_pytest_esp32_generic:
   tags: [ esp32, generic ]
   parallel: 7
 
-component_ut_pytest_esp32_generic_multi_device:
+pytest_components_esp32_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -510,7 +510,7 @@ component_ut_pytest_esp32_generic_multi_device:
     - build_pytest_components_esp32
   tags: [ esp32, generic_multi_device ]
 
-component_ut_pytest_esp32_wifi_two_dut:
+pytest_components_esp32_wifi_two_dut:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32-wifi
@@ -518,7 +518,7 @@ component_ut_pytest_esp32_wifi_two_dut:
     - build_pytest_components_esp32
   tags: [ esp32, wifi_two_dut ]
 
-component_ut_pytest_esp32_adc:
+pytest_components_esp32_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32-adc
@@ -526,7 +526,7 @@ component_ut_pytest_esp32_adc:
     - build_pytest_components_esp32
   tags: [ esp32, adc ]
 
-component_ut_pytest_esp32_sdio:
+pytest_components_esp32_sdio:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32-sdio
@@ -534,7 +534,7 @@ component_ut_pytest_esp32_sdio:
     - build_pytest_components_esp32
   tags: [ esp32, sdio_master_slave ]
 
-component_ut_pytest_esp32_ip101:
+pytest_components_esp32_ip101:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -542,7 +542,7 @@ component_ut_pytest_esp32_ip101:
     - build_pytest_components_esp32
   tags: [ esp32, ip101 ]
 
-component_ut_pytest_esp32_lan8720:
+pytest_components_esp32_lan8720:
   extends:
     - .pytest_components_dir_template
     - .rules:labels-protected:lan8720  # FIXME: IDFCI-1176
@@ -550,7 +550,7 @@ component_ut_pytest_esp32_lan8720:
     - build_pytest_components_esp32
   tags: [ esp32, lan8720 ]
 
-component_ut_pytest_esp32_ethernet:
+pytest_components_esp32_ethernet:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -558,7 +558,7 @@ component_ut_pytest_esp32_ethernet:
     - build_pytest_components_esp32
   tags: [ esp32, ethernet ]
 
-component_ut_pytest_esp32_flash_encryption:
+pytest_components_esp32_flash_encryption:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -566,7 +566,7 @@ component_ut_pytest_esp32_flash_encryption:
     - build_pytest_components_esp32
   tags: [ esp32, flash_encryption ]
 
-component_ut_pytest_esp32_flash_multi:
+pytest_components_esp32_flash_multi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32-flash_multi
@@ -574,7 +574,7 @@ component_ut_pytest_esp32_flash_multi:
     - build_pytest_components_esp32
   tags: [ esp32, flash_multi ]
 
-component_ut_pytest_esp32_xtal32k:
+pytest_components_esp32_xtal32k:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -582,7 +582,7 @@ component_ut_pytest_esp32_xtal32k:
     - build_pytest_components_esp32
   tags: [ esp32, xtal32k ]
 
-component_ut_pytest_esp32_no32kXtal:
+pytest_components_esp32_no32kXtal:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -590,7 +590,7 @@ component_ut_pytest_esp32_no32kXtal:
     - build_pytest_components_esp32
   tags: [ esp32, no32kXtal ]
 
-component_ut_pytest_esp32_rs485_multi:
+pytest_components_esp32_rs485_multi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -598,7 +598,7 @@ component_ut_pytest_esp32_rs485_multi:
     - build_pytest_components_esp32
   tags: [ esp32, multi_dut_modbus_rs485 ]
 
-component_ut_pytest_esp32_psramv0:
+pytest_components_esp32_psramv0:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -606,7 +606,7 @@ component_ut_pytest_esp32_psramv0:
     - build_pytest_components_esp32
   tags: [ esp32, psramv0 ]
 
-component_ut_pytest_esp32s2_generic:
+pytest_components_esp32s2_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s2
@@ -615,7 +615,7 @@ component_ut_pytest_esp32s2_generic:
   tags: [ esp32s2, generic ]
   parallel: 5
 
-component_ut_pytest_esp32s2_generic_multi_device:
+pytest_components_esp32s2_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s2
@@ -623,7 +623,7 @@ component_ut_pytest_esp32s2_generic_multi_device:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, generic_multi_device ]
 
-component_ut_pytest_esp32s2_adc:
+pytest_components_esp32s2_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s2-adc
@@ -631,7 +631,7 @@ component_ut_pytest_esp32s2_adc:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, adc ]
 
-component_ut_pytest_esp32s2_flash_multi:
+pytest_components_esp32s2_flash_multi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s2-flash_multi
@@ -639,7 +639,7 @@ component_ut_pytest_esp32s2_flash_multi:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, flash_multi ]
 
-component_ut_pytest_esp32s3_generic:
+pytest_components_esp32s3_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -648,7 +648,7 @@ component_ut_pytest_esp32s3_generic:
   tags: [ esp32s3, generic ]
   parallel: 5
 
-component_ut_pytest_esp32s3_generic_multi_device:
+pytest_components_esp32s3_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -656,7 +656,7 @@ component_ut_pytest_esp32s3_generic_multi_device:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, generic_multi_device ]
 
-component_ut_pytest_esp32s3_adc:
+pytest_components_esp32s3_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3-adc
@@ -664,7 +664,7 @@ component_ut_pytest_esp32s3_adc:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, adc ]
 
-component_ut_pytest_esp32s3_octal_psram:
+pytest_components_esp32s3_octal_psram:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -672,7 +672,7 @@ component_ut_pytest_esp32s3_octal_psram:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, octal_psram ]
 
-component_ut_pytest_esp32s3_flash_encryption_f4r8:
+pytest_components_esp32s3_flash_encryption_f4r8:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -680,7 +680,7 @@ component_ut_pytest_esp32s3_flash_encryption_f4r8:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, flash_encryption_f4r8 ]
 
-component_ut_pytest_esp32s3_flash_encryption_f8r8:
+pytest_components_esp32s3_flash_encryption_f8r8:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -688,7 +688,7 @@ component_ut_pytest_esp32s3_flash_encryption_f8r8:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, flash_encryption_f8r8 ]
 
-component_ut_pytest_esp32s3_flash_multi:
+pytest_components_esp32s3_flash_multi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3-flash_multi
@@ -696,7 +696,7 @@ component_ut_pytest_esp32s3_flash_multi:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, flash_multi ]
 
-component_ut_pytest_esp32s3_mspi_f4r4:
+pytest_components_esp32s3_mspi_f4r4:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -704,7 +704,7 @@ component_ut_pytest_esp32s3_mspi_f4r4:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, MSPI_F4R4 ]
 
-component_ut_pytest_esp32s3_mspi_f4r8:
+pytest_components_esp32s3_mspi_f4r8:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -712,7 +712,7 @@ component_ut_pytest_esp32s3_mspi_f4r8:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, MSPI_F4R8 ]
 
-component_ut_pytest_esp32s3_mspi_f8r8:
+pytest_components_esp32s3_mspi_f8r8:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3
@@ -720,7 +720,7 @@ component_ut_pytest_esp32s3_mspi_f8r8:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, MSPI_F8R8 ]
 
-component_ut_pytest_esp32c2_generic:
+pytest_components_esp32c2_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c2
@@ -729,7 +729,7 @@ component_ut_pytest_esp32c2_generic:
   tags: [ esp32c2, generic, xtal_40mhz ]
   parallel: 3
 
-component_ut_pytest_esp32c2_adc:
+pytest_components_esp32c2_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c2-adc
@@ -737,7 +737,7 @@ component_ut_pytest_esp32c2_adc:
     - build_pytest_components_esp32c2
   tags: [ esp32c2, adc, xtal_26mhz ]
 
-component_ut_pytest_esp32c2_generic_multi_device:
+pytest_components_esp32c2_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c2
@@ -745,7 +745,7 @@ component_ut_pytest_esp32c2_generic_multi_device:
     - build_pytest_components_esp32c2
   tags: [ esp32c2, generic_multi_device, xtal_40mhz ]
 
-component_ut_pytest_esp32c2_xtal_26mhz:
+pytest_components_esp32c2_xtal_26mhz:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c2
@@ -753,7 +753,7 @@ component_ut_pytest_esp32c2_xtal_26mhz:
     - build_pytest_components_esp32c2
   tags: [ esp32c2, generic, xtal_26mhz ]
 
-component_ut_pytest_esp32c3_generic:
+pytest_components_esp32c3_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3
@@ -762,7 +762,7 @@ component_ut_pytest_esp32c3_generic:
   tags: [ esp32c3, generic ]
   parallel: 3
 
-component_ut_pytest_esp32c3_generic_multi_device:
+pytest_components_esp32c3_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3
@@ -770,7 +770,7 @@ component_ut_pytest_esp32c3_generic_multi_device:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, generic_multi_device ]
 
-component_ut_pytest_esp32c3_wifi_two_dut:
+pytest_components_esp32c3_wifi_two_dut:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3-wifi
@@ -778,7 +778,7 @@ component_ut_pytest_esp32c3_wifi_two_dut:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, wifi_two_dut ]
 
-component_ut_pytest_esp32s3_wifi_two_dut:
+pytest_components_esp32s3_wifi_two_dut:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3-wifi
@@ -786,7 +786,7 @@ component_ut_pytest_esp32s3_wifi_two_dut:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, wifi_two_dut ]
 
-component_ut_pytest_esp32c2_wifi_two_dut:
+pytest_components_esp32c2_wifi_two_dut:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c2-wifi
@@ -794,7 +794,7 @@ component_ut_pytest_esp32c2_wifi_two_dut:
     - build_pytest_components_esp32c2
   tags: [ esp32c2, wifi_two_dut, xtal_26mhz ]
 
-component_ut_pytest_esp32c3_adc:
+pytest_components_esp32c3_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3-adc
@@ -802,7 +802,7 @@ component_ut_pytest_esp32c3_adc:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, adc ]
 
-component_ut_pytest_esp32c3_flash_encryption:
+pytest_components_esp32c3_flash_encryption:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3
@@ -810,7 +810,7 @@ component_ut_pytest_esp32c3_flash_encryption:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, flash_encryption ]
 
-component_ut_pytest_esp32c3_flash_multi:
+pytest_components_esp32c3_flash_multi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3-flash_multi
@@ -818,7 +818,7 @@ component_ut_pytest_esp32c3_flash_multi:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, flash_multi ]
 
-component_ut_pytest_esp32_sdmmc:
+pytest_components_esp32_sdmmc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32
@@ -826,7 +826,7 @@ component_ut_pytest_esp32_sdmmc:
     - build_pytest_components_esp32
   tags: [ esp32, sdcard_sdmode ]
 
-component_ut_pytest_esp32_sdspi:
+pytest_components_esp32_sdspi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32-sdio
@@ -834,7 +834,7 @@ component_ut_pytest_esp32_sdspi:
     - build_pytest_components_esp32
   tags: [ esp32, sdcard_spimode ]
 
-component_ut_pytest_esp32s2_sdspi:
+pytest_components_esp32s2_sdspi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s2-sdio
@@ -842,7 +842,7 @@ component_ut_pytest_esp32s2_sdspi:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, sdcard_spimode ]
 
-component_ut_pytest_esp32c3_sdspi:
+pytest_components_esp32c3_sdspi:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c3-sdio
@@ -850,7 +850,7 @@ component_ut_pytest_esp32c3_sdspi:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, sdcard_spimode ]
 
-component_ut_pytest_esp32c6_generic:
+pytest_components_esp32c6_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c6
@@ -859,7 +859,7 @@ component_ut_pytest_esp32c6_generic:
   tags: [ esp32c6, generic ]
   parallel: 2
 
-component_ut_pytest_esp32h2_generic:
+pytest_components_esp32h2_generic:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32h2
@@ -868,7 +868,7 @@ component_ut_pytest_esp32h2_generic:
   tags: [ esp32h2, generic ]
   parallel: 2
 
-component_ut_pytest_esp32h2_generic_multi_device:
+pytest_components_esp32h2_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32h2
@@ -876,7 +876,7 @@ component_ut_pytest_esp32h2_generic_multi_device:
     - build_pytest_components_esp32h2
   tags: [ esp32h2, generic_multi_device ]
 
-component_ut_pytest_esp32h2_adc:
+pytest_components_esp32h2_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32h2-adc
@@ -884,7 +884,7 @@ component_ut_pytest_esp32h2_adc:
     - build_pytest_components_esp32h2
   tags: [ esp32h2, adc ]
 
-component_ut_pytest_esp32c6_generic_multi_device:
+pytest_components_esp32c6_generic_multi_device:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c6
@@ -892,7 +892,7 @@ component_ut_pytest_esp32c6_generic_multi_device:
     - build_pytest_components_esp32c6
   tags: [ esp32c6, generic_multi_device ]
 
-component_ut_pytest_esp32c6_adc:
+pytest_components_esp32c6_adc:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c6-adc
@@ -900,7 +900,7 @@ component_ut_pytest_esp32c6_adc:
     - build_pytest_components_esp32c6
   tags: [ esp32c6, adc ]
 
-component_ut_pytest_esp32c6_i154:
+pytest_components_esp32c6_i154:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32c6-i154
@@ -908,7 +908,7 @@ component_ut_pytest_esp32c6_i154:
     - build_pytest_components_esp32c6
   tags: [ esp32c6, ieee802154 ]
 
-example_test_pytest_openthread_br:
+pytest_examples_openthread_br:
   extends:
     - .pytest_examples_dir_template
     - .rules:test:example_test-i154
@@ -920,7 +920,7 @@ example_test_pytest_openthread_br:
     - esp32c6
     - openthread_br
 
-component_ut_pytest_esp32s3_usb_host:
+pytest_components_esp32s3_usb_host:
   extends:
     - .pytest_components_dir_template
     - .rules:test:component_ut-esp32s3-usb
@@ -933,7 +933,7 @@ component_ut_pytest_esp32s3_usb_host:
   variables:
     TEST_DIR: tools/test_apps
 
-test_app_test_pytest_esp32_generic:
+pytest_test_apps_esp32_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32
@@ -943,7 +943,7 @@ test_app_test_pytest_esp32_generic:
   variables:
     SETUP_TOOLS: "1"  # need gdb
 
-test_app_test_pytest_esp32_jtag:
+pytest_test_apps_esp32_jtag:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32
@@ -954,7 +954,7 @@ test_app_test_pytest_esp32_jtag:
     SETUP_TOOLS: "1"  # need gdb
     PYTEST_EXTRA_FLAGS: "--log-cli-level DEBUG"
 
-test_app_test_pytest_esp32s2_generic:
+pytest_test_apps_esp32s2_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32s2
@@ -964,7 +964,7 @@ test_app_test_pytest_esp32s2_generic:
   variables:
     SETUP_TOOLS: "1"  # need gdb
 
-test_app_test_pytest_esp32s3_generic:
+pytest_test_apps_esp32s3_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32s3
@@ -972,7 +972,7 @@ test_app_test_pytest_esp32s3_generic:
     - build_pytest_test_apps_esp32s3
   tags: [ esp32s3, generic ]
 
-test_app_test_pytest_esp32c2_generic:
+pytest_test_apps_esp32c2_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32c2
@@ -980,7 +980,7 @@ test_app_test_pytest_esp32c2_generic:
     - build_pytest_test_apps_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
-test_app_test_pytest_esp32c3_generic:
+pytest_test_apps_esp32c3_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32c3
@@ -988,7 +988,7 @@ test_app_test_pytest_esp32c3_generic:
     - build_pytest_test_apps_esp32c3
   tags: [ esp32c3, generic ]
 
-test_app_test_pytest_esp32c6_generic:
+pytest_test_apps_esp32c6_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32c6
@@ -996,7 +996,7 @@ test_app_test_pytest_esp32c6_generic:
     - build_pytest_test_apps_esp32c6
   tags: [ esp32c6, generic ]
 
-test_app_test_pytest_esp32h2_generic:
+pytest_test_apps_esp32h2_generic:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32h2
@@ -1004,7 +1004,7 @@ test_app_test_pytest_esp32h2_generic:
     - build_pytest_test_apps_esp32h2
   tags: [ esp32h2, generic ]
 
-test_app_test_pytest_esp32s3_mspi_f8r8:
+pytest_test_apps_esp32s3_mspi_f8r8:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32s3
@@ -1012,7 +1012,7 @@ test_app_test_pytest_esp32s3_mspi_f8r8:
     - build_pytest_test_apps_esp32s3
   tags: [ esp32s3, MSPI_F8R8 ]
 
-test_app_test_pytest_esp32s3_mspi_f4r8:
+pytest_test_apps_esp32s3_mspi_f4r8:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32s3
@@ -1020,7 +1020,7 @@ test_app_test_pytest_esp32s3_mspi_f4r8:
     - build_pytest_test_apps_esp32s3
   tags: [ esp32s3, MSPI_F4R8 ]
 
-test_app_test_pytest_esp32s3_mspi_f4r4:
+pytest_test_apps_esp32s3_mspi_f4r4:
   extends:
     - .pytest_test_apps_dir_template
     - .rules:test:custom_test-esp32s3