Revert "ci: rename all the generic s3 tag to generic_s3_fixme"

This reverts commit 9bb9b58b3b.

.gitlab/ci/target-test.yml

@@ -49,7 +49,7 @@ example_test_pytest_esp32s3_generic:
     - build_pytest_examples_esp32s3
   variables:
     TARGET: ESP32S3
-    ENV_MARKER: generic_s3_fixme
+    ENV_MARKER: generic
 
 example_test_pytest_esp32c3_generic:
   extends:
@@ -164,7 +164,7 @@ component_ut_pytest_esp32s3_generic:
     - build_pytest_components_esp32s3
   variables:
     TARGET: ESP32S3
-    ENV_MARKER: generic_s3_fixme
+    ENV_MARKER: generic
 
 component_ut_pytest_esp32s3_octal_psram:
   extends:
@@ -221,7 +221,7 @@ test_app_test_pytest_esp32s3_generic:
     - build_pytest_test_apps_esp32s3
   variables:
     TARGET: ESP32S3
-    ENV_MARKER: generic_s3_fixme
+    ENV_MARKER: generic
 
 test_app_test_pytest_esp32c3_generic:
   extends:

conftest.py

@@ -255,11 +255,6 @@ class IdfPytestEmbedded:
             if 'all_targets' in item_marker_names(item):
                 for _target in [*SUPPORTED_TARGETS, *PREVIEW_TARGETS]:
                     item.add_marker(_target)
-            # FIXME: temporarily modify the s3 runner tag "generic" to "s3_generic" due to the deep sleep bug
-            if 'generic' in item_marker_names(item) and 'esp32s3' in item_marker_names(
-                item
-            ):
-                item.add_marker('generic_s3_fixme')
 
         # filter all the test cases with "--target"
         if self.target:

pytest.ini

@@ -25,7 +25,6 @@ markers =
 
   # env markers
   generic: tests should be run on generic runners
-  generic_s3_fixme: temporary workaround s3 runner
   flash_suspend: support flash suspend feature
   ip101: connected via wired 10/100M ethernet
   lan8720: connected via LAN8720 ethernet transceiver