diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 71dbe58a7f..11ccd47784 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -131,6 +131,7 @@ build:integration_test: - sdio # UT_044, UT_045 - usb # USB Device & Host tests - spi_multi # UT_C2_SPI_DUAL + - adc # component_ut_pytest_esp32x_adc patterns: - "{0}-{1}-{2}" - "{0}-{2}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 70ab941386..264599334a 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -233,8 +233,16 @@ .patterns-unit_test-spi_multi: &patterns-unit_test-spi_multi - "components/esp_serial_slave_link/**/*" - "components/driver/**/*" + - "components/hal/**/*" - "examples/peripherals/spi_slave*/**/*" +# for jobs: component_ut_pytest_esp32x_adc: +.patterns-component_ut-adc: &patterns-component_ut-adc + - "components/esp_adc/**/*" + - "components/driver/**/*" + - "components/hal/**/*" + - "components/esp_hw_support/**/*" + - "components/efuse/**/*" ############## # if anchors # @@ -513,6 +521,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32: rules: @@ -532,6 +542,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32c2: rules: @@ -547,6 +559,8 @@ changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32c3: rules: @@ -565,6 +579,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32h2: rules: @@ -583,6 +599,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32s2: rules: @@ -601,6 +619,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:component_ut-esp32s3: rules: @@ -619,6 +639,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc .rules:build:custom_test: rules: @@ -1011,6 +1033,8 @@ changes: *patterns-build_system - <<: *if-dev-push changes: *patterns-component_ut + - <<: *if-dev-push + changes: *patterns-component_ut-adc - <<: *if-dev-push changes: *patterns-custom_test - <<: *if-dev-push @@ -1236,6 +1260,19 @@ - <<: *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 + .rules:test:component_ut-esp32-bt: rules: - <<: *if-revert-branch @@ -1312,6 +1349,19 @@ - <<: *if-label-component_ut_esp32c2 - <<: *if-label-unit_test_esp32c2 +.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 + .rules:test:component_ut-esp32c2-bt: rules: - <<: *if-revert-branch @@ -1393,6 +1443,19 @@ - <<: *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 + .rules:test:component_ut-esp32c3-bt: rules: - <<: *if-revert-branch @@ -1474,6 +1537,19 @@ - <<: *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 + .rules:test:component_ut-esp32h2-bt: rules: - <<: *if-revert-branch @@ -1555,6 +1631,19 @@ - <<: *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 + .rules:test:component_ut-esp32s2-bt: rules: - <<: *if-revert-branch @@ -1636,6 +1725,19 @@ - <<: *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 + .rules:test:component_ut-esp32s3-bt: rules: - <<: *if-revert-branch @@ -1715,6 +1817,17 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32 + - <<: *if-label-target_test + .rules:test:custom_test-esp32-bt: rules: - <<: *if-revert-branch @@ -1790,6 +1903,17 @@ when: never - <<: *if-label-custom_test_esp32c2 +.rules:test:custom_test-esp32c2-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c2 + - <<: *if-label-target_test + .rules:test:custom_test-esp32c2-bt: rules: - <<: *if-revert-branch @@ -1869,6 +1993,17 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32c3-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32c3 + - <<: *if-label-target_test + .rules:test:custom_test-esp32c3-bt: rules: - <<: *if-revert-branch @@ -1948,6 +2083,17 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32h2-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32h2 + - <<: *if-label-target_test + .rules:test:custom_test-esp32h2-bt: rules: - <<: *if-revert-branch @@ -2027,6 +2173,17 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32s2-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32s2 + - <<: *if-label-target_test + .rules:test:custom_test-esp32s2-bt: rules: - <<: *if-revert-branch @@ -2106,6 +2263,17 @@ - <<: *if-dev-push changes: *patterns-custom_test +.rules:test:custom_test-esp32s3-adc: + rules: + - <<: *if-revert-branch + when: never + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-custom_test + - <<: *if-label-custom_test_esp32s3 + - <<: *if-label-target_test + .rules:test:custom_test-esp32s3-bt: rules: - <<: *if-revert-branch @@ -2187,6 +2355,17 @@ - <<: *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 + .rules:test:example_test-esp32-bt: rules: - <<: *if-revert-branch @@ -2279,6 +2458,17 @@ when: never - <<: *if-label-example_test_esp32c2 +.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 + .rules:test:example_test-esp32c2-bt: rules: - <<: *if-revert-branch @@ -2368,6 +2558,17 @@ - <<: *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 + .rules:test:example_test-esp32c3-bt: rules: - <<: *if-revert-branch @@ -2466,6 +2667,17 @@ - <<: *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 + .rules:test:example_test-esp32h2-bt: rules: - <<: *if-revert-branch @@ -2555,6 +2767,17 @@ - <<: *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 + .rules:test:example_test-esp32s2-bt: rules: - <<: *if-revert-branch @@ -2644,6 +2867,17 @@ - <<: *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 + .rules:test:example_test-esp32s3-bt: rules: - <<: *if-revert-branch @@ -2765,6 +2999,17 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32-adc: + 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_esp32 + .rules:test:unit_test-esp32-bt: rules: - <<: *if-revert-branch @@ -2844,6 +3089,17 @@ when: never - <<: *if-label-unit_test_esp32c2 +.rules:test:unit_test-esp32c2-adc: + 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_esp32c2 + .rules:test:unit_test-esp32c2-bt: rules: - <<: *if-revert-branch @@ -2927,6 +3183,17 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32c3-adc: + 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 + .rules:test:unit_test-esp32c3-bt: rules: - <<: *if-revert-branch @@ -3010,6 +3277,17 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32h2-adc: + 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_esp32h2 + .rules:test:unit_test-esp32h2-bt: rules: - <<: *if-revert-branch @@ -3093,6 +3371,17 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32s2-adc: + 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 + .rules:test:unit_test-esp32s2-bt: rules: - <<: *if-revert-branch @@ -3176,6 +3465,17 @@ - <<: *if-dev-push changes: *patterns-unit_test +.rules:test:unit_test-esp32s3-adc: + 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_esp32s3 + .rules:test:unit_test-esp32s3-bt: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index d244bc6a77..6f82490889 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -231,7 +231,7 @@ component_ut_pytest_esp32_generic: component_ut_pytest_esp32_adc: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32 + - .rules:test:component_ut-esp32-adc needs: - build_pytest_components_esp32 tags: [ esp32, adc ] @@ -279,7 +279,7 @@ component_ut_pytest_esp32s2_generic: component_ut_pytest_esp32s2_adc: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32s2 + - .rules:test:component_ut-esp32s2-adc needs: - build_pytest_components_esp32s2 tags: [ esp32s2, adc ] @@ -303,7 +303,7 @@ component_ut_pytest_esp32s3_generic: component_ut_pytest_esp32s3_adc: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32s3 + - .rules:test:component_ut-esp32s3-adc needs: - build_pytest_components_esp32s3 tags: [ esp32s3, adc ] @@ -351,7 +351,7 @@ component_ut_pytest_esp32c2_generic: component_ut_pytest_esp32c2_adc: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32c2 + - .rules:test:component_ut-esp32c2-adc needs: - build_pytest_components_esp32c2 tags: [ esp32c2, adc ] @@ -375,7 +375,7 @@ component_ut_pytest_esp32c3_generic: component_ut_pytest_esp32c3_adc: extends: - .pytest_components_dir_template - - .rules:test:component_ut-esp32c3 + - .rules:test:component_ut-esp32c3-adc needs: - build_pytest_components_esp32c3 tags: [ esp32c3, adc ]