Merge branch 'feature/ci_add_pattern_flash_multi' into 'master'

ci: add pattern for esp flash

See merge request espressif/esp-idf!22185

.gitlab/ci/dependencies/dependencies.yml

@@ -139,6 +139,7 @@ build:integration_test:
       - usb       # USB Device & Host tests
       - adc       # component_ut_pytest_esp32x_adc
       - i154
+      - flash_multi
   patterns:
     - "{0}-{1}-{2}"
     - "{0}-{2}"

.gitlab/ci/rules.yml

@@ -236,11 +236,29 @@
   - "components/esp_https_ota/**/*"
 
 # for jobs: component_ut_pytest_esp32_sdio
-.patterns-unit_test-sdio: &patterns-unit_test-sdio
+.patterns-component_ut-sdio: &patterns-component_ut-sdio
-  - "components/hal/**/*"
+  - "components/hal/sdio*.c"
-  - "components/driver/**/*"
+  - "components/hal/include/hal/sdio*.h"
+  - "components/driver/sdspi*.c"
+  - "components/driver/sdio*.c"
+  - "components/driver/sdmmc*.c"
+  - "components/driver/include/driver/sdspi*.h"
+  - "components/driver/include/driver/sdio*.h"
+  - "components/driver/include/driver/sdmmc*.h"
   - "components/sdmmc/**/*"
 
+# for jobs: component_ut_pytest_flash_multi
+.patterns-component_ut-flash_multi: &patterns-component_ut-flash_multi
+  - "components/spi_flash/**/*"
+  - "components/hal/spi_flash*.c"
+  - "components/hal/include/hal/spi_flash*.h"
+
+# for jobs: UT_C3_FLASH
+.patterns-unit_test-flash_multi: &patterns-unit_test-flash_multi
+  - "components/spi_flash/**/*"
+  - "components/hal/spi_flash*.c"
+  - "components/hal/include/hal/spi_flash*.h"
+
 # for jobs: USB host and device examples
 .patterns-example_test-usb: &patterns-example_test-usb
   - "components/hal/usb*.c"
@@ -577,6 +595,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -606,6 +628,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -634,6 +660,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -662,6 +692,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -690,6 +724,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -718,6 +756,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -746,6 +788,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -774,6 +820,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -802,6 +852,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -1482,6 +1536,10 @@
       changes: *patterns-build_system
     - <<: *if-dev-push
       changes: *patterns-component_ut
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
     - <<: *if-dev-push
       changes: *patterns-component_ut-usb
     - <<: *if-dev-push
@@ -1513,7 +1571,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test:
   rules:
@@ -1547,7 +1605,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32:
   rules:
@@ -1574,7 +1632,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32c2:
   rules:
@@ -1600,7 +1658,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32c3:
   rules:
@@ -1626,7 +1684,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32c6:
   rules:
@@ -1652,7 +1710,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32h2:
   rules:
@@ -1678,7 +1736,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32s2:
   rules:
@@ -1704,7 +1762,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:build:unit_test-esp32s3:
   rules:
@@ -1730,7 +1788,7 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
     - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
+      changes: *patterns-unit_test-flash_multi
 
 .rules:labels-protected:lan8720:
   rules:
@@ -1792,6 +1850,32 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-adc
 
+.rules:test:component_ut-esp32-flash_multi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+
+.rules:test:component_ut-esp32-sdio:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-sdio
+
 .rules:test:component_ut-esp32-wifi:
   rules:
     - <<: *if-revert-branch
@@ -1874,6 +1958,19 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-adc
 
+.rules:test:component_ut-esp32c3-flash_multi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32c3
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+
 .rules:test:component_ut-esp32c3-wifi:
   rules:
     - <<: *if-revert-branch
@@ -1956,6 +2053,19 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-adc
 
+.rules:test:component_ut-esp32s2-flash_multi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32s2
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+
 .rules:test:component_ut-esp32s3:
   rules:
     - <<: *if-revert-branch
@@ -1984,6 +2094,19 @@
     - <<: *if-dev-push
       changes: *patterns-target_test-adc
 
+.rules:test:component_ut-esp32s3-flash_multi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-component_ut
+    - <<: *if-label-component_ut_esp32s3
+    - <<: *if-label-target_test
+    - <<: *if-dev-push
+      changes: *patterns-component_ut-flash_multi
+
 .rules:test:component_ut-esp32s3-usb:
   rules:
     - <<: *if-revert-branch
@@ -2468,19 +2591,6 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
 
-.rules:test:unit_test-esp32-sdio:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-target_test
-    - <<: *if-label-unit_test
-    - <<: *if-label-unit_test_esp32
-    - <<: *if-dev-push
-      changes: *patterns-unit_test-sdio
-
 .rules:test:unit_test-esp32c2:
   rules:
     - <<: *if-revert-branch
@@ -2507,6 +2617,19 @@
     - <<: *if-dev-push
       changes: *patterns-unit_test
 
+.rules:test:unit_test-esp32c3-flash_multi:
+  rules:
+    - <<: *if-revert-branch
+      when: never
+    - <<: *if-protected
+    - <<: *if-label-build-only
+      when: never
+    - <<: *if-label-target_test
+    - <<: *if-label-unit_test
+    - <<: *if-label-unit_test_esp32c3
+    - <<: *if-dev-push
+      changes: *patterns-unit_test-flash_multi
+
 .rules:test:unit_test-esp32c6:
   rules:
     - <<: *if-revert-branch

.gitlab/ci/target-test.yml

@@ -461,7 +461,7 @@ component_ut_pytest_esp32_adc:
 component_ut_pytest_esp32_sdio:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:unit_test-esp32-sdio
+    - .rules:test:component_ut-esp32-sdio
   needs:
     - build_pytest_components_esp32
   tags: [ esp32, sdio_master_slave ]
@@ -501,7 +501,7 @@ component_ut_pytest_esp32_flash_encryption:
 component_ut_pytest_esp32_flash_multi:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32
+    - .rules:test:component_ut-esp32-flash_multi
   needs:
     - build_pytest_components_esp32
   tags: [ esp32, flash_multi ]
@@ -566,7 +566,7 @@ component_ut_pytest_esp32s2_adc:
 component_ut_pytest_esp32s2_flash_multi:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32s2
+    - .rules:test:component_ut-esp32s2-flash_multi
   needs:
     - build_pytest_components_esp32s2
   tags: [ esp32s2, flash_multi ]
@@ -623,7 +623,7 @@ component_ut_pytest_esp32s3_flash_encryption_f8r8:
 component_ut_pytest_esp32s3_flash_multi:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32s3
+    - .rules:test:component_ut-esp32s3-flash_multi
   needs:
     - build_pytest_components_esp32s3
   tags: [ esp32s3, flash_multi ]
@@ -721,7 +721,7 @@ component_ut_pytest_esp32c3_flash_encryption:
 component_ut_pytest_esp32c3_flash_multi:
   extends:
     - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32c3
+    - .rules:test:component_ut-esp32c3-flash_multi
   needs:
     - build_pytest_components_esp32c3
   tags: [ esp32c3, flash_multi ]
@@ -1265,7 +1265,9 @@ UT_C3:
     - UT_T1_1
 
 UT_C3_FLASH:
-  extends: .unit_test_esp32c3_template
+  extends:
+    - .unit_test_esp32c3_template
+    - .rules:test:unit_test-esp32c3-flash_multi
   tags:
     - ESP32C3_IDF
     - UT_T1_ESP_FLASH