Merge branch 'bugfix/ci_app_test_dependency' into 'master'

CI: correct example vs. custom tests dependency

See merge request espressif/esp-idf!8258

components/mqtt/weekend_test/mqtt_publish_test.py

@@ -113,7 +113,7 @@ def test_single_config(dut, transport, qos, repeat, published):
     event_stop_client.clear()
 
 
-@ttfw_idf.idf_example_test(env_tag="Example_WIFI")
+@ttfw_idf.idf_custom_test(env_tag="Example_WIFI")
 def test_weekend_mqtt_publish(env, extra_data):
     # Using broker url dictionary for different transport
     global broker_host
@@ -127,7 +127,7 @@ def test_weekend_mqtt_publish(env, extra_data):
       3. Test evaluates python client received correct qos0 message
       4. Test ESP32 client received correct qos0 message
     """
-    dut1 = env.get_dut("mqtt_publish_connect_test", "examples/protocols/mqtt/publish_connect_test")
+    dut1 = env.get_dut("mqtt_publish_connect_test", "tools/test_apps/protocols/mqtt/publish_connect_test")
     # Look for host:port in sdkconfig
     try:
         # python client subscribes to the topic to which esp client publishes and vice versa

tools/ci/config/build.yml

@@ -217,6 +217,7 @@ build_examples_cmake_esp32s2:
       - $BOT_LABEL_BUILD
       - $BOT_LABEL_INTEGRATION_TEST
       - $BOT_LABEL_REGULAR_TEST
+      - $BOT_LABEL_CUSTOM_TEST
       - $BOT_LABEL_WEEKEND_TEST
   script:
     - mkdir -p ${BUILD_PATH}

tools/ci/config/target-test.yml

@@ -98,7 +98,6 @@
     variables:
       - $BOT_TRIGGER_WITH_LABEL == null
       - $BOT_LABEL_CUSTOM_TEST
-      - $BOT_LABEL_EXAMPLE_TEST
   variables:
     TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
     TEST_CASE_PATH: "$CI_PROJECT_DIR/tools/test_apps"

tools/test_apps/protocols/mqtt/publish_connect_test/app_test.py

@@ -131,7 +131,7 @@ class TlsServer:
 
 
 @ttfw_idf.idf_custom_test(env_tag="Example_WIFI", group="test-apps")
-def test_examples_protocol_mqtt_publish_connect(env, extra_data):
+def test_app_protocol_mqtt_publish_connect(env, extra_data):
     """
     steps:
       1. join AP
@@ -227,4 +227,4 @@ def test_examples_protocol_mqtt_publish_connect(env, extra_data):
 
 
 if __name__ == '__main__':
-    test_examples_protocol_mqtt_publish_connect()
+    test_app_protocol_mqtt_publish_connect()