diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index f7ceff278a..8b2ce40e30 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -115,7 +115,6 @@ - *target_test - *all_targets - - wifi # pytest*wifi* - - ethernet # pytest*ethernet* patterns: - "{0}-{1}-{2}" - "{0}-{2}" diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index eb4e53624f..79c5a5554a 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -181,19 +181,6 @@ - "components/bt/esp_ble_mesh/lib/lib" - ".gitmodules" -# for jobs: example_test*ethernet* -.patterns-example_test-ethernet: &patterns-example_test-ethernet - - "tools/ci/python_packages/common_test_methods.py" - - "examples/common_components/**/*" - - "examples/protocols/**/*" - - "examples/system/ota/**/*" - - "examples/ethernet/iperf/**/*" - - "examples/network/vlan_support/**/*" - - "components/esp_eth/??[!s][!t]*/**/*" - - "components/esp_eth/???/**/*" - - "components/esp_eth/*" - - "components/esp_netif/esp_netif_handlers.c" - # for jobs: example_test*wifi* .patterns-example_test-wifi: &patterns-example_test-wifi - "tools/ci/python_packages/common_test_methods.py" @@ -1506,8 +1493,6 @@ changes: *patterns-downloadable-tools - <<: *if-dev-push changes: *patterns-example_test - - <<: *if-dev-push - changes: *patterns-example_test-ethernet - <<: *if-dev-push changes: *patterns-example_test-wifi - <<: *if-dev-push @@ -1854,19 +1839,6 @@ - <<: *if-dev-push changes: *patterns-example_test -.rules:test:example_test-esp32-ethernet: - 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-ethernet - .rules:test:example_test-esp32-wifi: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 91ffca345a..91a639b910 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -246,15 +246,6 @@ pytest_examples_esp32p4_generic: artifacts: false tags: [ esp32p4, generic ] -pytest_examples_esp32_ethernet_ota: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-ethernet - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, ethernet_ota ] - pytest_examples_esp32_wifi_high_traffic: extends: - .pytest_examples_dir_template @@ -264,24 +255,6 @@ pytest_examples_esp32_wifi_high_traffic: artifacts: false tags: [ esp32, wifi_high_traffic ] -pytest_examples_esp32_ethernet: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-ethernet - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, ethernet] - -pytest_examples_esp32_ethernet_httpbin: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-ethernet - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, httpbin] - pytest_examples_esp32_8mb_flash: extends: - .pytest_examples_dir_template @@ -435,24 +408,6 @@ pytest_examples_esp32_wifi_wlan: artifacts: false tags: [ esp32, wifi_wlan ] -pytest_examples_esp32_ethernet_router: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-ethernet - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, ethernet_router ] - -pytest_examples_esp32_ethernet_vlan: - extends: - - .pytest_examples_dir_template - - .rules:test:example_test-esp32-ethernet - needs: - - job: build_pytest_examples_esp32 - artifacts: false - tags: [ esp32, ethernet_vlan ] - pytest_examples_esp32_ethernet_bridge: extends: - .pytest_examples_dir_template diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml index 93f5b739c1..8a717aff7d 100644 --- a/examples/network/.build-test-rules.yml +++ b/examples/network/.build-test-rules.yml @@ -22,7 +22,18 @@ examples/network/simple_sniffer: examples/network/sta2eth: disable: - if: SOC_WIFI_SUPPORTED != 1 + examples/network/vlan_support: disable_test: - if: IDF_TARGET not in ["esp32"] reason: Runner uses esp32 ethernet kit + depends_components: + - esp_eth + depends_filepatterns: + - tools/ci/python_packages/common_test_methods.py + - examples/common_components/**/* + - examples/protocols/**/* + - examples/system/ota/**/* + - examples/ethernet/iperf/**/* + - examples/network/vlan_support/**/* + - components/esp_netif/esp_netif_handlers.c diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml index 2b0b52480c..535f8796f7 100644 --- a/examples/protocols/.build-test-rules.yml +++ b/examples/protocols/.build-test-rules.yml @@ -1,5 +1,11 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +.ethernet_dependencies: ðernet_dependencies + # TODO: IDFCI-1821 + depends_filepatterns: + - tools/ci/python_packages/common_test_methods.py + - components/esp_netif/esp_netif_handlers.c + examples/protocols/esp_http_client: enable: - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux" @@ -11,6 +17,7 @@ examples/protocols/esp_http_client: - if: IDF_TARGET == "esp32p4" temporary: true reason: not supported on p4 + <<: *ethernet_dependencies examples/protocols/esp_local_ctrl: disable: @@ -32,6 +39,7 @@ examples/protocols/http_request: - if: IDF_TARGET != "esp32" temporary: true reason: only test on esp32 + <<: *ethernet_dependencies examples/protocols/http_server: disable: @@ -78,6 +86,7 @@ examples/protocols/https_mbedtls: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/https_request: disable: @@ -88,6 +97,7 @@ examples/protocols/https_request: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/https_server/simple: disable: @@ -118,6 +128,7 @@ examples/protocols/https_x509_bundle: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/icmp_echo: disable: @@ -158,6 +169,7 @@ examples/protocols/mqtt/ssl: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/mqtt/ssl_ds: disable: @@ -186,6 +198,7 @@ examples/protocols/mqtt/tcp: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/mqtt/ws: disable: @@ -196,6 +209,7 @@ examples/protocols/mqtt/ws: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/mqtt/wss: disable: @@ -206,6 +220,7 @@ examples/protocols/mqtt/wss: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/mqtt5: disable: @@ -216,6 +231,7 @@ examples/protocols/mqtt5: - if: IDF_TARGET != "esp32" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/protocols/smtp_client: disable: diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index c622e50dac..d011ce4725 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -1,5 +1,11 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps +.ethernet_dependencies: ðernet_dependencies + # TODO: IDFCI-1821 + depends_filepatterns: + - tools/ci/python_packages/common_test_methods.py + - components/esp_netif/esp_netif_handlers.c + examples/system/app_trace_basic: disable: - if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32p4"] @@ -151,6 +157,7 @@ examples/system/ota/advanced_https_ota: - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/system/ota/native_ota_example: disable: @@ -161,6 +168,7 @@ examples/system/ota/native_ota_example: - if: IDF_TARGET == "esp32c6" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/system/ota/otatool: disable: @@ -177,6 +185,7 @@ examples/system/ota/pre_encrypted_ota: - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" temporary: true reason: lack of runners + <<: *ethernet_dependencies examples/system/ota/simple_ota_example: disable: diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 47177fff01..22f992ed66 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -52,6 +52,16 @@ tools/test_apps/protocols/mqtt/publish_connect_test: - if: IDF_TARGET == "esp32s2" or IDF_TARGET == "esp32c3" temporary: true reason: lack of runners + depends_components: + - esp_eth + depends_filepatterns: + - tools/ci/python_packages/common_test_methods.py + - examples/common_components/**/* + - examples/protocols/**/* + - examples/system/ota/**/* + - examples/ethernet/iperf/**/* + - examples/network/vlan_support/**/* + - components/esp_netif/esp_netif_handlers.c tools/test_apps/protocols/netif_components: enable: