diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 3f16b63d6c..806654928f 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -119,7 +119,6 @@ - sdio # pytest*sdio* - usb # USB Device & Host tests - adc # pytest*adc* - - flash_multi - ecdsa - nvs_encr_hmac patterns: diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 98e18be4f1..d0faa3bea6 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -248,12 +248,6 @@ - "components/esp_driver_sdmmc/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: USB host and device examples .patterns-example_test-usb: &patterns-example_test-usb - "components/hal/usb*.c" @@ -1622,8 +1616,6 @@ changes: *patterns-component_ut - <<: *if-dev-push changes: *patterns-component_ut-adc - - <<: *if-dev-push - changes: *patterns-component_ut-flash_multi - <<: *if-dev-push changes: *patterns-component_ut-nvs_encr_hmac - <<: *if-dev-push @@ -1700,19 +1692,6 @@ - <<: *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 @@ -1797,19 +1776,6 @@ - <<: *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-nvs_encr_hmac: rules: - <<: *if-revert-branch @@ -1961,19 +1927,6 @@ - <<: *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-esp32s2-sdio: rules: - <<: *if-revert-branch @@ -2015,19 +1968,6 @@ - <<: *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 diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index ddac7aa93a..640d97c998 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -861,15 +861,6 @@ pytest_components_esp32_flash_encryption: artifacts: false tags: [ esp32, flash_encryption ] -pytest_components_esp32_flash_multi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32-flash_multi - needs: - - job: build_pytest_components_esp32 - artifacts: false - tags: [ esp32, flash_multi ] - pytest_components_esp32_xtal32k: extends: - .pytest_components_dir_template @@ -934,15 +925,6 @@ pytest_components_esp32s2_adc: artifacts: false tags: [ esp32s2, adc ] -pytest_components_esp32s2_flash_multi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32s2-flash_multi - needs: - - job: build_pytest_components_esp32s2 - artifacts: false - tags: [ esp32s2, flash_multi ] - pytest_components_esp32s3_generic: extends: - .pytest_components_dir_template @@ -1007,15 +989,6 @@ pytest_components_esp32s3_flash_encryption_f8r8: artifacts: false tags: [ esp32s3, flash_encryption_f8r8 ] -pytest_components_esp32s3_flash_multi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32s3-flash_multi - needs: - - job: build_pytest_components_esp32s3 - artifacts: false - tags: [ esp32s3, flash_multi ] - pytest_components_esp32s3_mspi_f4r4: extends: - .pytest_components_dir_template @@ -1178,15 +1151,6 @@ pytest_components_esp32c3_nvs_encr_hmac: artifacts: false tags: [ esp32c3, nvs_encr_hmac ] -pytest_components_esp32c3_flash_multi: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32c3-flash_multi - needs: - - job: build_pytest_components_esp32c3 - artifacts: false - tags: [ esp32c3, flash_multi ] - pytest_components_esp32_sdspi: extends: - .pytest_components_dir_template