From 9a9b1cd11f86a88e9086162d7f3dcb05034057b2 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 30 Nov 2023 15:54:55 +0100 Subject: [PATCH] ci(ecdsa): migrate from .gitlab/ci/rules.yml to .build-test-rules.yml --- .gitlab/ci/dependencies/dependencies.yml | 1 - .gitlab/ci/rules.yml | 35 ------------------------ .gitlab/ci/target-test.yml | 9 ------ components/mbedtls/.build-test-rules.yml | 4 +++ 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 20adde4dfe..295d44962c 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* - - ecdsa patterns: - "{0}-{1}-{2}" - "{0}-{2}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 3700ecf93d..bd96a26084 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -277,14 +277,6 @@ .patterns-example_test-adc: &patterns-example_test-adc - "examples/peripherals/adc/**/*" -.patterns-target_test-ecdsa: &patterns-target_test-ecdsa - - "components/{hal,efuse}/???[!t]*/**/*" - - "components/{hal,efuse}/??[!s]?*/**/*" - - "components/{hal,efuse}/???/**/*" - - "components/{hal,efuse}/??/**/*" - - "components/{hal,efuse}/*" - - "components/mbedtls/port/ecdsa/*" - ############## # if anchors # ############## @@ -601,8 +593,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -639,8 +629,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -677,8 +665,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -715,8 +701,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -939,8 +923,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -965,8 +947,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1630,8 +1610,6 @@ changes: *patterns-example_test-wifi - <<: *if-dev-push changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1844,19 +1822,6 @@ - <<: *if-dev-push changes: *patterns-target_test-adc -.rules:test:component_ut-esp32h2-ecdsa: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32h2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - .rules:test:component_ut-esp32p4: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index a65167ab7a..58fe684685 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -1216,15 +1216,6 @@ pytest_components_esp32h2_adc: artifacts: false tags: [ esp32h2, adc ] -pytest_components_esp32h2_ecdsa: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32h2-ecdsa - needs: - - job: build_pytest_components_esp32h2 - artifacts: false - tags: [ esp32h2, ecdsa_efuse ] - pytest_components_esp32h2_usb_serial_jtag: extends: - .pytest_components_dir_template diff --git a/components/mbedtls/.build-test-rules.yml b/components/mbedtls/.build-test-rules.yml index 705dd4b66b..f33fabc474 100644 --- a/components/mbedtls/.build-test-rules.yml +++ b/components/mbedtls/.build-test-rules.yml @@ -5,3 +5,7 @@ components/mbedtls/test_apps: - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1 - if: CONFIG_NAME == "psram_all_ext" and SOC_SPIRAM_SUPPORTED != 1 - if: CONFIG_NAME == "ecdsa_sign" and SOC_ECDSA_SUPPORTED != 1 + depends_components: + - efuse + depends_filepatterns: + - components/mbedtls/port/ecdsa/*