diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 295d44962c..d1ecaeec2e 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -118,7 +118,6 @@ - ethernet # pytest*ethernet* - sdio # pytest*sdio* - usb # USB Device & Host tests - - adc # pytest*adc* patterns: - "{0}-{1}-{2}" - "{0}-{2}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index bd96a26084..9d14675c64 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -263,20 +263,6 @@ - "components/hal/esp32s*/include/hal/usb*.h" - "components/usb/**/*" -# for jobs: *_pytest_esp32x_adc: -.patterns-target_test-adc: &patterns-target_test-adc - - "components/{esp_adc,driver,hal,esp_hw_support,efuse}/???[!t]*/**/*" - - "components/{esp_adc,driver,hal,esp_hw_support,efuse}/??[!s]?*/**/*" - - "components/{esp_adc,driver,hal,esp_hw_support,efuse}/???/**/*" - - "components/{esp_adc,driver,hal,esp_hw_support,efuse}/??/**/*" - - "components/{esp_adc,driver,hal,esp_hw_support,efuse}/*" - -.patterns-component_ut-adc: &patterns-component_ut-adc - - "components/esp_adc/**/*" - -.patterns-example_test-adc: &patterns-example_test-adc - - "examples/peripherals/adc/**/*" - ############## # if anchors # ############## @@ -591,8 +577,6 @@ changes: *patterns-component_ut-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -627,8 +611,6 @@ changes: *patterns-component_ut-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -663,8 +645,6 @@ changes: *patterns-component_ut-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -699,8 +679,6 @@ changes: *patterns-component_ut-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -921,8 +899,6 @@ changes: *patterns-custom_test-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -945,8 +921,6 @@ changes: *patterns-custom_test-wifi - <<: *if-dev-push changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1582,8 +1556,6 @@ changes: *patterns-build_template-app - <<: *if-dev-push changes: *patterns-component_ut - - <<: *if-dev-push - changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-component_ut-sdio - <<: *if-dev-push @@ -1598,8 +1570,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-example_test - - <<: *if-dev-push - changes: *patterns-example_test-adc - <<: *if-dev-push changes: *patterns-example_test-ethernet - <<: *if-dev-push @@ -1608,8 +1578,6 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi - - <<: *if-dev-push - changes: *patterns-target_test-adc - <<: *if-dev-push changes: *patterns-target_test-wifi @@ -1639,21 +1607,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32-sdio: rules: - <<: *if-revert-branch @@ -1680,21 +1633,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32c2-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32c2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-component_ut-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32c2-wifi: rules: - <<: *if-revert-branch @@ -1723,21 +1661,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32c3-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32c3-sdio: rules: - <<: *if-revert-branch @@ -1779,21 +1702,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32c6-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-component_ut - - <<: *if-label-component_ut_esp32c6 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-component_ut-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32h2: rules: - <<: *if-revert-branch @@ -1807,21 +1715,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32h2-adc: - 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-component_ut-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32p4: rules: - <<: *if-revert-branch @@ -1848,21 +1741,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32s2-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32s2-sdio: rules: - <<: *if-revert-branch @@ -1889,21 +1767,6 @@ - <<: *if-dev-push changes: *patterns-component_ut -.rules:test:component_ut-esp32s3-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:component_ut-esp32s3-usb: rules: - <<: *if-revert-branch @@ -2111,21 +1974,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32-ethernet: rules: - <<: *if-revert-branch @@ -2191,21 +2039,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32c2-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32c2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32c2-wifi: rules: - <<: *if-revert-branch @@ -2236,21 +2069,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32c3-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32c3-include_nightly_run-rule: rules: - <<: *if-revert-branch @@ -2303,21 +2121,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32c6-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32c6 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32c6-wifi: rules: - <<: *if-revert-branch @@ -2348,21 +2151,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32h2-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32h2 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32p4: rules: - <<: *if-revert-branch @@ -2393,21 +2181,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32s2-adc: - 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-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32s2-sdio: rules: - <<: *if-revert-branch @@ -2464,21 +2237,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32s3-adc: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-label-build-only - when: never - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32s3 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-example_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-adc - .rules:test:example_test-esp32s3-wifi: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 58fe684685..7f2062e482 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -598,69 +598,6 @@ pytest_examples_esp32_extflash: artifacts: false tags: [ esp32, external_flash ] -pytest_examples_esp32_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-adc - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, adc ] - -pytest_examples_esp32s2_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32s2-adc - needs: - - job: build_pytest_examples_esp32s2 - artifacts: false - tags: [ esp32s2, adc ] - -pytest_examples_esp32s3_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32s3-adc - needs: - - job: build_pytest_examples_esp32s3 - artifacts: false - tags: [ esp32s3, adc ] - -pytest_examples_esp32c3_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32c3-adc - needs: - - job: build_pytest_examples_esp32c3 - artifacts: false - tags: [ esp32c3, adc ] - -pytest_examples_esp32c2_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32c2-adc - needs: - - job: build_pytest_examples_esp32c2 - artifacts: false - tags: [ esp32c2, adc, xtal_26mhz] - -pytest_examples_esp32c6_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32c6-adc - needs: - - job: build_pytest_examples_esp32c6 - artifacts: false - tags: [ esp32c6, adc ] - -pytest_examples_esp32h2_adc: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32h2-adc - needs: - - job: build_pytest_examples_esp32h2 - artifacts: false - tags: [ esp32h2, adc ] - pytest_examples_esp32s3_emmc: extends: - .pytest_examples_dir_template @@ -704,15 +641,6 @@ pytest_components_esp32_wifi_two_dut: artifacts: false tags: [ esp32, wifi_two_dut ] -pytest_components_esp32_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32-adc - needs: - - job: build_pytest_components_esp32 - artifacts: false - tags: [ esp32, adc ] - pytest_components_esp32_sdmmc: extends: - .pytest_components_dir_template @@ -907,15 +835,6 @@ pytest_components_esp32s2_generic_multi_device: artifacts: false tags: [ esp32s2, generic_multi_device ] -pytest_components_esp32s2_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32s2-adc - needs: - - job: build_pytest_components_esp32s2 - artifacts: false - tags: [ esp32s2, adc ] - pytest_components_esp32s3_generic: extends: - .pytest_components_dir_template @@ -935,15 +854,6 @@ pytest_components_esp32s3_generic_multi_device: artifacts: false tags: [ esp32s3, generic_multi_device ] -pytest_components_esp32s3_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32s3-adc - needs: - - job: build_pytest_components_esp32s3 - artifacts: false - tags: [ esp32s3, adc ] - pytest_components_esp32s3_octal_psram: extends: - .pytest_components_dir_template @@ -1025,15 +935,6 @@ pytest_components_esp32c2_generic: tags: [ esp32c2, generic, xtal_40mhz ] parallel: 3 -pytest_components_esp32c2_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32c2-adc - needs: - - job: build_pytest_components_esp32c2 - artifacts: false - tags: [ esp32c2, adc, xtal_26mhz ] - pytest_components_esp32c2_generic_multi_device: extends: - .pytest_components_dir_template @@ -1115,15 +1016,6 @@ pytest_components_esp32c2_wifi_two_dut: artifacts: false tags: [ esp32c2, wifi_two_dut, xtal_26mhz ] -pytest_components_esp32c3_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32c3-adc - needs: - - job: build_pytest_components_esp32c3 - artifacts: false - tags: [ esp32c3, adc ] - pytest_components_esp32c3_flash_encryption: extends: - .pytest_components_dir_template @@ -1207,15 +1099,6 @@ pytest_components_esp32h2_generic_multi_device: artifacts: false tags: [ esp32h2, generic_multi_device ] -pytest_components_esp32h2_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32h2-adc - needs: - - job: build_pytest_components_esp32h2 - artifacts: false - tags: [ esp32h2, adc ] - pytest_components_esp32h2_usb_serial_jtag: extends: - .pytest_components_dir_template @@ -1233,15 +1116,6 @@ pytest_components_esp32c6_generic_multi_device: artifacts: false tags: [ esp32c6, generic_multi_device ] -pytest_components_esp32c6_adc: - extends: - - .pytest_components_dir_template - - .rules:test:component_ut-esp32c6-adc - needs: - - job: build_pytest_components_esp32c6 - artifacts: false - tags: [ esp32c6, adc ] - pytest_examples_openthread_sleep: extends: - .pytest_examples_dir_template diff --git a/components/driver/test_apps/.build-test-rules.yml b/components/driver/test_apps/.build-test-rules.yml index 7696651dbc..fd259747f7 100644 --- a/components/driver/test_apps/.build-test-rules.yml +++ b/components/driver/test_apps/.build-test-rules.yml @@ -21,6 +21,12 @@ components/driver/test_apps/i2s_test_apps/legacy_i2s_driver: components/driver/test_apps/legacy_adc_driver: disable: - if: SOC_ADC_SUPPORTED != 1 + depends_components: + - efuse + - esp_driver_i2s + - esp_driver_spi + depends_filepatterns: + - components/driver/deprecated/**/*adc* components/driver/test_apps/legacy_i2c_driver: disable_test: diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml index 1941ae6f5a..8680827930 100644 --- a/examples/peripherals/.build-test-rules.yml +++ b/examples/peripherals/.build-test-rules.yml @@ -1,5 +1,12 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +.adc_dependencies: &adc_dependencies + depends_components: + - esp_adc + - efuse + - esp_driver_i2s + - esp_driver_spi + .i2c_dependencies: &i2c_dependencies depends_filepatterns: # components @@ -10,10 +17,12 @@ examples/peripherals/adc/continuous_read: disable: - if: SOC_ADC_DMA_SUPPORTED != 1 + <<: *adc_dependencies examples/peripherals/adc/oneshot_read: disable: - if: SOC_ADC_SUPPORTED != 1 + <<: *adc_dependencies examples/peripherals/analog_comparator: disable: @@ -30,6 +39,16 @@ examples/peripherals/dac: disable: - if: SOC_DAC_SUPPORTED != 1 +examples/peripherals/dac/dac_cosine_wave: + disable: + - if: SOC_DAC_SUPPORTED != 1 + depends_components: + - esp_adc + - efuse + - esp_driver_i2s + - esp_driver_spi + - esp_driver_dac + examples/peripherals/gpio: depends_components: - esp_driver_gpio