From 7cf82ac032b8fc1aa8eceae7290ebf20d1a5a865 Mon Sep 17 00:00:00 2001 From: wanlei Date: Thu, 2 Feb 2023 12:45:05 +0800 Subject: [PATCH] ci: add pattern for esp flash --- .gitlab/ci/dependencies/dependencies.yml | 1 + .gitlab/ci/rules.yml | 115 +++++++++++++++++++++++ .gitlab/ci/target-test.yml | 12 ++- 3 files changed, 123 insertions(+), 5 deletions(-) diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 4539b5c2ef..0bb19a14b9 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.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}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index f3124d2ba9..d1ba70199f 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -241,6 +241,18 @@ - "components/driver/**/*" - "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 +589,8 @@ 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-usb - <<: *if-dev-push @@ -606,6 +620,8 @@ 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-usb - <<: *if-dev-push @@ -634,6 +650,8 @@ 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-usb - <<: *if-dev-push @@ -662,6 +680,8 @@ 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-usb - <<: *if-dev-push @@ -690,6 +710,8 @@ 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-usb - <<: *if-dev-push @@ -718,6 +740,8 @@ 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-usb - <<: *if-dev-push @@ -746,6 +770,8 @@ 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-usb - <<: *if-dev-push @@ -774,6 +800,8 @@ 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-usb - <<: *if-dev-push @@ -802,6 +830,8 @@ 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-usb - <<: *if-dev-push @@ -1482,6 +1512,8 @@ 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-usb - <<: *if-dev-push @@ -1512,6 +1544,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1546,6 +1580,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1573,6 +1609,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1599,6 +1637,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1625,6 +1665,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1651,6 +1693,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1677,6 +1721,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1703,6 +1749,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1729,6 +1777,8 @@ changes: *patterns-target_test-wifi - <<: *if-dev-push changes: *patterns-unit_test + - <<: *if-dev-push + changes: *patterns-unit_test-flash_multi - <<: *if-dev-push changes: *patterns-unit_test-sdio @@ -1792,6 +1842,19 @@ - <<: *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-wifi: rules: - <<: *if-revert-branch @@ -1874,6 +1937,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 +2032,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 +2073,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 @@ -2507,6 +2609,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 diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 9d56ea2816..019a4ca439 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -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 ] @@ -1264,7 +1264,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