Merge branch 'ci/enable_s3_default_s3' into 'master'

ci: re-enable running S3 tests by default

See merge request espressif/esp-idf!19430

.gitlab/ci/dependencies/dependencies.yml

@@ -78,45 +78,6 @@ build:integration_test:
   included_in:
     - build:target_test
 
-# -------------
-# Special Cases
-# -------------
-"build:{0}-esp32s3":
-  matrix:
-    - *target_test
-  labels:
-    - build
-    - "{0}"
-    - target_test
-  patterns:
-    - build_components
-    - build_system
-    - build_target_test
-    - "{0}"
-    - "build-{0}"
-  included_in:
-    - "build:{0}"
-    - build:target_test
-
-"build:component_ut-esp32s3":
-  matrix:
-    - *target_test
-  labels:
-    - build
-    - component_ut
-    - unit_test
-    - target_test
-  patterns:
-    - build_components
-    - build_system
-    - build_target_test
-    - component_ut
-    - unit_test
-    - build-component_ut
-    - build-unit_test
-  included_in:
-    - "build:{0}"
-    - build:target_test
 
 ####################
 # Target Test Jobs #
@@ -217,27 +178,6 @@ build:integration_test:
     - "build:component_ut-esp32c2"
     - build:target_test
 
-# due to the lack of runners, s3 tests will only be triggered by label
-"test:{0}-esp32s3":
-  matrix:
-    - *target_test
-  labels:
-    - "{0}_esp32s3"
-  included_in:
-    - "build:{0}"
-    - "build:{0}-esp32s3"
-    - build:target_test
-
-# overwrite the esp32s3 component ut again
-"test:component_ut-esp32s3": # component_ut will trigger by unit_test as well, since now we have 2 kinds of UT
-  labels:
-    - "component_ut_esp32s3"
-    - "unit_test_esp32s3"
-  included_in:
-    - build:component_ut
-    - "build:component_ut-esp32s3"
-    - build:target_test
-
 "test:integration_test":
   labels:
     - integration_test

.gitlab/ci/rules.yml

@@ -513,8 +513,6 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
-    - <<: *if-dev-push
-      changes: *patterns-unit_test
 
 .rules:build:component_ut-esp32:
   rules:
@@ -621,8 +619,6 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
-    - <<: *if-dev-push
-      changes: *patterns-unit_test
 
 .rules:build:custom_test:
   rules:
@@ -1632,8 +1628,13 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-component_ut
     - <<: *if-label-component_ut_esp32s3
+    - <<: *if-label-target_test
+    - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
+    - <<: *if-dev-push
+      changes: *patterns-component_ut
 
 .rules:test:component_ut-esp32s3-bt:
   rules:
@@ -2099,7 +2100,11 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-custom_test
     - <<: *if-label-custom_test_esp32s3
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-custom_test
 
 .rules:test:custom_test-esp32s3-bt:
   rules:
@@ -2631,7 +2636,13 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32s3
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-build-example_test
+    - <<: *if-dev-push
+      changes: *patterns-example_test
 
 .rules:test:example_test-esp32s3-bt:
   rules:
@@ -3159,7 +3170,11 @@
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-target_test
+    - <<: *if-label-unit_test
     - <<: *if-label-unit_test_esp32s3
+    - <<: *if-dev-push
+      changes: *patterns-unit_test
 
 .rules:test:unit_test-esp32s3-bt:
   rules: