From b37336f8b45cd35ddb1ac4979ade4bed2f9d556a Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Fri, 25 Mar 2022 12:24:51 +0800
Subject: [PATCH] Revert "ci: temporarily disable S3 target tests"

This reverts commit 8df02332c1eeb1eb306e4e9cbd8fcdc1032114b5.
---
 .gitlab/ci/target-test.yml | 81 ++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 6c08c4780f..82482406ed 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -41,16 +41,15 @@ example_test_pytest_esp32s2_generic:
     TARGET: ESP32S2
     ENV_MARKER: generic
 
-# Temporary disabled until S3 runners are added, IDFCI-1171
-# example_test_pytest_esp32s3_generic:
-#   extends:
-#     - .pytest_examples_dir_template
-#     - .rules:test:example_test-esp32s3
-#   needs:
-#     - build_pytest_examples_esp32s3
-#   variables:
-#     TARGET: ESP32S3
-#     ENV_MARKER: generic
+example_test_pytest_esp32s3_generic:
+  extends:
+    - .pytest_examples_dir_template
+    - .rules:test:example_test-esp32s3
+  needs:
+    - build_pytest_examples_esp32s3
+  variables:
+    TARGET: ESP32S3
+    ENV_MARKER: generic
 
 example_test_pytest_esp32c3_generic:
   extends:
@@ -117,16 +116,15 @@ component_ut_pytest_esp32s2_generic:
     TARGET: ESP32S2
     ENV_MARKER: generic
 
-# Temporary disabled until S3 runners are added, IDFCI-1171
-# component_ut_pytest_esp32s3_generic:
-#   extends:
-#     - .pytest_components_dir_template
-#     - .rules:test:component_ut-esp32s3
-#   needs:
-#     - build_pytest_components_esp32s3
-#   variables:
-#     TARGET: ESP32S3
-#     ENV_MARKER: generic
+component_ut_pytest_esp32s3_generic:
+  extends:
+    - .pytest_components_dir_template
+    - .rules:test:component_ut-esp32s3
+  needs:
+    - build_pytest_components_esp32s3
+  variables:
+    TARGET: ESP32S3
+    ENV_MARKER: generic
 
 component_ut_pytest_esp32s3_octal_psram:
   extends:
@@ -175,16 +173,15 @@ test_app_test_pytest_esp32s2_generic:
     ENV_MARKER: generic
     SETUP_TOOLS: "1"  # need gdb
 
-# Temporary disabled until S3 runners are added, IDFCI-1171
-# test_app_test_pytest_esp32s3_generic:
-#   extends:
-#     - .pytest_test_apps_dir_template
-#     - .rules:test:custom_test-esp32s3
-#   needs:
-#     - build_pytest_test_apps_esp32s3
-#   variables:
-#     TARGET: ESP32S3
-#     ENV_MARKER: generic
+test_app_test_pytest_esp32s3_generic:
+  extends:
+    - .pytest_test_apps_dir_template
+    - .rules:test:custom_test-esp32s3
+  needs:
+    - build_pytest_test_apps_esp32s3
+  variables:
+    TARGET: ESP32S3
+    ENV_MARKER: generic
 
 test_app_test_pytest_esp32c3_generic:
   extends:
@@ -492,12 +489,11 @@ example_test_ESP32_SDSPI:
     - ESP32
     - UT_T1_SPIMODE
 
-# Temporary disabled until S3 runners are added, IDFCI-1171
-# example_test_S3_GENERIC:
-#   extends: .example_test_esp32s3_template
-#   tags:
-#     - ESP32S3
-#     - Example_GENERIC
+example_test_S3_GENERIC:
+  extends: .example_test_esp32s3_template
+  tags:
+    - ESP32S3
+    - Example_GENERIC
 
 example_test_ESP32S2_SDSPI:
   extends: .example_test_esp32s2_template
@@ -873,13 +869,12 @@ UT_C3_SDSPI:
     - ESP32C3_IDF
     - UT_T1_SPIMODE
 
-# Temporary disabled until S3 runners are added, IDFCI-1171
-# UT_S3:
-#   extends: .unit_test_esp32s3_template
-#   parallel: 44
-#   tags:
-#     - ESP32S3_IDF
-#     - UT_T1_1
+UT_S3:
+  extends: .unit_test_esp32s3_template
+  parallel: 44
+  tags:
+    - ESP32S3_IDF
+    - UT_T1_1
 
 UT_S3_SPI_DUAL:
   extends: .unit_test_esp32s3_template