Merge branch 'bugfix/update_can_target_test' into 'master'

CAN: Reenable example tests, update job and environment labels.

See merge request espressif/esp-idf!6487

examples/peripherals/can/can_alert_and_recovery/example_test.py

@@ -20,7 +20,7 @@ STR_EXPECT = ("CAN Alert and Recovery: Driver installed", "CAN Alert and Recover
 EXPECT_TIMEOUT = 20
 
 
-@IDF.idf_example_test(env_tag='Example_CAN1', ignore=True)
+@IDF.idf_example_test(env_tag='Example_CAN1')
 def test_can_alert_and_recovery_example(env, extra_data):
     dut = env.get_dut('dut1', 'examples/peripherals/can/can_alert_and_recovery', dut_class=ESP32DUT)
     dut.start_app()

examples/peripherals/can/can_network/example_test.py

@@ -37,7 +37,7 @@ def dut_thread_callback(**kwargs):
     result[0] = True
 
 
-@IDF.idf_example_test(env_tag='Example_CAN2', ignore=True)
+@IDF.idf_example_test(env_tag='Example_CAN2')
 def test_can_network_example(env, extra_data):
 
     # Get device under test. "dut1", "dut2", and "dut3" must be properly defined in EnvConfig

examples/peripherals/can/can_self_test/example_test.py

@@ -20,9 +20,9 @@ STR_EXPECT = ("CAN Self Test: Driver installed", "CAN Self Test: Driver uninstal
 EXPECT_TIMEOUT = 20
 
 
-@IDF.idf_example_test(env_tag='Example_CAN1', ignore=True)
+@IDF.idf_example_test(env_tag='Example_CAN1')
 def test_can_self_test_example(env, extra_data):
-    # Get device under test, flash and start example. "dut4" must be defined in EnvConfig
+    # Get device under test, flash and start example. "dut1" must be defined in EnvConfig
     dut = env.get_dut('dut1', 'examples/peripherals/can/can_self_test', dut_class=ESP32DUT)
     dut.start_app()
 

tools/ci/config/target-test.yml

@@ -168,11 +168,17 @@ example_test_002:
     - ESP32
     - Example_SDIO
 
-example_test_004:
+example_test_004A:
   extends: .example_test_template
   tags:
     - ESP32
-    - Example_CAN
+    - Example_CAN1
+
+example_test_004B:
+  extends: .example_test_template
+  tags:
+    - ESP32
+    - Example_CAN2
 
 example_test_005:
   extends: .example_test_template