diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index d5dac4fdd8..e3e828b946 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -233,7 +233,19 @@ - "components/app_update/**/*" - "components/esp_https_ota/**/*" -# for jobs: component_ut_pytest_esp32_sdio +# for jobs: example_test_pytest_sdio related +.patterns-example_test-sdio: &patterns-example_test-sdio + - "components/hal/sdio*.c" + - "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_sdio related .patterns-component_ut-sdio: &patterns-component_ut-sdio - "components/hal/sdio*.c" - "components/hal/include/hal/sdio*.h" @@ -245,6 +257,18 @@ - "components/driver/include/driver/sdmmc*.h" - "components/sdmmc/**/*" +# for jobs: UT_xx_SDSPI related +.patterns-unit_test-sdio: &patterns-unit_test-sdio + - "components/hal/sdio*.c" + - "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/**/*" @@ -1140,6 +1164,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1178,6 +1204,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1214,6 +1242,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1251,6 +1281,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1287,6 +1319,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1323,6 +1357,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1359,6 +1395,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1395,6 +1433,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1431,6 +1471,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1552,6 +1594,8 @@ changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-i154 + - <<: *if-dev-push + changes: *patterns-example_test-sdio - <<: *if-dev-push changes: *patterns-example_test-usb - <<: *if-dev-push @@ -1570,6 +1614,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test: rules: @@ -1604,6 +1650,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32: rules: @@ -1631,6 +1679,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32c2: rules: @@ -1657,6 +1707,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32c3: rules: @@ -1683,6 +1735,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32c6: rules: @@ -1709,6 +1763,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32h2: rules: @@ -1735,6 +1791,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32s2: rules: @@ -1761,6 +1819,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:build:unit_test-esp32s3: rules: @@ -1787,6 +1847,8 @@ changes: *patterns-unit_test - <<: *if-dev-push changes: *patterns-unit_test-flash_multi + - <<: *if-dev-push + changes: *patterns-unit_test-sdio .rules:labels-protected:lan8720: rules: @@ -1969,6 +2031,19 @@ - <<: *if-dev-push changes: *patterns-component_ut-flash_multi +.rules:test:component_ut-esp32c3-sdio: + 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-sdio + .rules:test:component_ut-esp32c3-wifi: rules: - <<: *if-revert-branch @@ -2064,6 +2139,19 @@ - <<: *if-dev-push changes: *patterns-component_ut-flash_multi +.rules:test:component_ut-esp32s2-sdio: + 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-sdio + .rules:test:component_ut-esp32s3: rules: - <<: *if-revert-branch @@ -2272,6 +2360,19 @@ when: never - <<: *if-example_test-ota-include_nightly_run-rule +.rules:test:example_test-esp32-sdio: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-example_test-sdio + .rules:test:example_test-esp32-wifi: rules: - <<: *if-revert-branch @@ -2367,6 +2468,19 @@ when: never - <<: *if-example_test-ota-include_nightly_run-rule +.rules:test:example_test-esp32c3-sdio: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32c3 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-example_test-sdio + .rules:test:example_test-esp32c3-wifi: rules: - <<: *if-revert-branch @@ -2438,6 +2552,19 @@ - <<: *if-dev-push changes: *patterns-target_test-adc +.rules:test:example_test-esp32s2-sdio: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-example_test + - <<: *if-label-example_test_esp32s2 + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-example_test-sdio + .rules:test:example_test-esp32s2-usb: rules: - <<: *if-revert-branch @@ -2628,6 +2755,19 @@ - <<: *if-dev-push changes: *patterns-unit_test-flash_multi +.rules:test:unit_test-esp32c3-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_esp32c3 + - <<: *if-dev-push + changes: *patterns-unit_test-sdio + .rules:test:unit_test-esp32c6: rules: - <<: *if-revert-branch @@ -2654,6 +2794,19 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32s2-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_esp32s2 + - <<: *if-dev-push + changes: *patterns-unit_test-sdio + .rules:test:unit_test-esp32s3: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 47d6945e94..6e2d771527 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -343,7 +343,7 @@ example_test_pytest_esp32_sdmmc: example_test_pytest_esp32_sdspi: extends: - .pytest_examples_dir_template - - .rules:test:example_test-esp32 + - .rules:test:example_test-esp32-sdio needs: - build_pytest_examples_esp32 tags: [ esp32, sdcard_spimode ] @@ -351,7 +351,7 @@ example_test_pytest_esp32_sdspi: example_test_pytest_esp32s2_sdspi: extends: - .pytest_examples_dir_template - - .rules:test:example_test-esp32s2 + - .rules:test:example_test-esp32s2-sdio needs: - build_pytest_examples_esp32s2 tags: [ esp32s2, sdcard_spimode ] @@ -359,7 +359,7 @@ example_test_pytest_esp32s2_sdspi: example_test_pytest_esp32c3_sdspi: extends: - .pytest_examples_dir_template - - .rules:test:example_test-esp32c3 + - .rules:test:example_test-esp32c3-sdio needs: - build_pytest_examples_esp32c3 tags: [ esp32c3, sdcard_spimode ] @@ -737,7 +737,7 @@ component_ut_pytest_esp32_sdmmc: component_ut_pytest_esp32_sdspi: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32 + - .rules:test:component_ut-esp32-sdio needs: - build_pytest_components_esp32 tags: [ esp32, sdcard_spimode ] @@ -745,7 +745,7 @@ component_ut_pytest_esp32_sdspi: component_ut_pytest_esp32s2_sdspi: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32s2 + - .rules:test:component_ut-esp32s2-sdio needs: - build_pytest_components_esp32s2 tags: [ esp32s2, sdcard_spimode ] @@ -753,7 +753,7 @@ component_ut_pytest_esp32s2_sdspi: component_ut_pytest_esp32c3_sdspi: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32c3 + - .rules:test:component_ut-esp32c3-sdio needs: - build_pytest_components_esp32c3 tags: [ esp32c3, sdcard_spimode ] @@ -1236,7 +1236,9 @@ UT_038: - UT_T1_ESP_FLASH UT_S2_SDSPI: - extends: .unit_test_esp32s2_template + extends: + - .unit_test_esp32s2_template + - .rules:test:unit_test-esp32s2-sdio tags: - ESP32S2_IDF - UT_T1_SPIMODE @@ -1279,7 +1281,9 @@ UT_C3_I2C: - UT_T2_I2C UT_C3_SDSPI: - extends: .unit_test_esp32c3_template + extends: + - .unit_test_esp32c3_template + - .rules:test:unit_test-esp32c3-sdio tags: - ESP32C3_IDF - UT_T1_SPIMODE