From 3ae1c587c0b92e0d67c8b0529449a11f841c50b6 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Tue, 13 Sep 2022 11:35:13 +0800
Subject: [PATCH] ci: use adc dedicated test runners for adc tests

---
 .gitlab/ci/target-test.yml                    | 40 +++++++++++++++++++
 .../legacy_adc_driver/pytest_legacy_adc.py    |  2 +-
 .../esp_adc/test_apps/adc/pytest_adc.py       |  4 +-
 pytest.ini                                    |  1 +
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 3185a11259..91125660a1 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -220,6 +220,14 @@ component_ut_pytest_esp32_generic:
     - build_pytest_components_esp32
   tags: [ esp32, generic ]
 
+component_ut_pytest_esp32_adc:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32
+  needs:
+    - build_pytest_components_esp32
+  tags: [ esp32, adc ]
+
 component_ut_pytest_esp32_ip101:
   extends:
     - .pytest_components_dir_template
@@ -252,6 +260,14 @@ component_ut_pytest_esp32s2_generic:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, generic ]
 
+component_ut_pytest_esp32s2_adc:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32s2
+  needs:
+    - build_pytest_components_esp32s2
+  tags: [ esp32s2, adc ]
+
 component_ut_pytest_esp32s3_generic:
   extends:
     - .pytest_components_dir_template
@@ -260,6 +276,14 @@ component_ut_pytest_esp32s3_generic:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, generic ]
 
+component_ut_pytest_esp32s3_adc:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32s3
+  needs:
+    - build_pytest_components_esp32s3
+  tags: [ esp32s3, adc ]
+
 component_ut_pytest_esp32s3_octal_psram:
   extends:
     - .pytest_components_dir_template
@@ -292,6 +316,14 @@ component_ut_pytest_esp32c2_generic:
     - build_pytest_components_esp32c2
   tags: [ esp32c2, generic, xtal_40mhz ]
 
+component_ut_pytest_esp32c2_adc:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32c2
+  needs:
+    - build_pytest_components_esp32c2
+  tags: [ esp32c2, adc ]
+
 component_ut_pytest_esp32c2_xtal_26mhz:
   extends:
     - .pytest_components_dir_template
@@ -308,6 +340,14 @@ component_ut_pytest_esp32c3_generic:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, generic ]
 
+component_ut_pytest_esp32c3_adc:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32c3
+  needs:
+    - build_pytest_components_esp32c3
+  tags: [ esp32c3, adc ]
+
 component_ut_pytest_esp32c3_flash_encryption:
   extends:
     - .pytest_components_dir_template
diff --git a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
index 9718e7ecee..881f8e0f6b 100644
--- a/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
+++ b/components/driver/test_apps/legacy_adc_driver/pytest_legacy_adc.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
 @pytest.mark.esp32s3
 @pytest.mark.esp32c3
 @pytest.mark.esp32c2
-@pytest.mark.generic
+@pytest.mark.adc
 @pytest.mark.parametrize(
     'config',
     [
diff --git a/components/esp_adc/test_apps/adc/pytest_adc.py b/components/esp_adc/test_apps/adc/pytest_adc.py
index 6bbeb4d5fa..bf7d2fb093 100644
--- a/components/esp_adc/test_apps/adc/pytest_adc.py
+++ b/components/esp_adc/test_apps/adc/pytest_adc.py
@@ -7,10 +7,10 @@ from pytest_embedded import Dut
 
 @pytest.mark.esp32
 @pytest.mark.esp32s2
-@pytest.mark.esp32c3
 @pytest.mark.esp32s3
+@pytest.mark.esp32c3
 @pytest.mark.esp32c2
-@pytest.mark.generic
+@pytest.mark.adc
 @pytest.mark.parametrize('config', [
     'iram_safe',
     'release',
diff --git a/pytest.ini b/pytest.ini
index 2433ce2571..7ddfbabf9d 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -59,6 +59,7 @@ markers =
   MSPI_F8R8: runner with Octal Flash and Octal PSRAM
   MSPI_F4R8: runner with Quad Flash and Octal PSRAM
   MSPI_F4R4: runner with Quad Flash and Quad PSRAM
+  adc: ADC related tests should run on adc runners
 
   # multi-dut markers
   multi_dut_generic: tests should be run on generic runners, at least have two duts connected.