ci(ethernet): migrate from .gitlab/ci/rules.yml to .build-test-rules.yml

This commit is contained in:
Fu Hanxi
2024-01-02 14:06:00 +01:00
parent 83d4e8c6ab
commit bb375ee79a
7 changed files with 46 additions and 74 deletions

View File

@@ -115,7 +115,6 @@
- *target_test - *target_test
- *all_targets - *all_targets
- - wifi # pytest*wifi* - - wifi # pytest*wifi*
- ethernet # pytest*ethernet*
patterns: patterns:
- "{0}-{1}-{2}" - "{0}-{1}-{2}"
- "{0}-{2}" - "{0}-{2}"

View File

@@ -181,19 +181,6 @@
- "components/bt/esp_ble_mesh/lib/lib" - "components/bt/esp_ble_mesh/lib/lib"
- ".gitmodules" - ".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* # for jobs: example_test*wifi*
.patterns-example_test-wifi: &patterns-example_test-wifi .patterns-example_test-wifi: &patterns-example_test-wifi
- "tools/ci/python_packages/common_test_methods.py" - "tools/ci/python_packages/common_test_methods.py"
@@ -1506,8 +1493,6 @@
changes: *patterns-downloadable-tools changes: *patterns-downloadable-tools
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test changes: *patterns-example_test
- <<: *if-dev-push
changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
@@ -1854,19 +1839,6 @@
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test 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:test:example_test-esp32-wifi:
rules: rules:
- <<: *if-revert-branch - <<: *if-revert-branch

View File

@@ -246,15 +246,6 @@ pytest_examples_esp32p4_generic:
artifacts: false artifacts: false
tags: [ esp32p4, generic ] 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: pytest_examples_esp32_wifi_high_traffic:
extends: extends:
- .pytest_examples_dir_template - .pytest_examples_dir_template
@@ -264,24 +255,6 @@ pytest_examples_esp32_wifi_high_traffic:
artifacts: false artifacts: false
tags: [ esp32, wifi_high_traffic ] 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: pytest_examples_esp32_8mb_flash:
extends: extends:
- .pytest_examples_dir_template - .pytest_examples_dir_template
@@ -435,24 +408,6 @@ pytest_examples_esp32_wifi_wlan:
artifacts: false artifacts: false
tags: [ esp32, wifi_wlan ] 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: pytest_examples_esp32_ethernet_bridge:
extends: extends:
- .pytest_examples_dir_template - .pytest_examples_dir_template

View File

@@ -22,7 +22,18 @@ examples/network/simple_sniffer:
examples/network/sta2eth: examples/network/sta2eth:
disable: disable:
- if: SOC_WIFI_SUPPORTED != 1 - if: SOC_WIFI_SUPPORTED != 1
examples/network/vlan_support: examples/network/vlan_support:
disable_test: disable_test:
- if: IDF_TARGET not in ["esp32"] - if: IDF_TARGET not in ["esp32"]
reason: Runner uses esp32 ethernet kit 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

View File

@@ -1,5 +1,11 @@
# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
.ethernet_dependencies: &ethernet_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: examples/protocols/esp_http_client:
enable: enable:
- if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux" - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
@@ -11,6 +17,7 @@ examples/protocols/esp_http_client:
- if: IDF_TARGET == "esp32p4" - if: IDF_TARGET == "esp32p4"
temporary: true temporary: true
reason: not supported on p4 reason: not supported on p4
<<: *ethernet_dependencies
examples/protocols/esp_local_ctrl: examples/protocols/esp_local_ctrl:
disable: disable:
@@ -32,6 +39,7 @@ examples/protocols/http_request:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: only test on esp32 reason: only test on esp32
<<: *ethernet_dependencies
examples/protocols/http_server: examples/protocols/http_server:
disable: disable:
@@ -78,6 +86,7 @@ examples/protocols/https_mbedtls:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/https_request: examples/protocols/https_request:
disable: disable:
@@ -88,6 +97,7 @@ examples/protocols/https_request:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/https_server/simple: examples/protocols/https_server/simple:
disable: disable:
@@ -118,6 +128,7 @@ examples/protocols/https_x509_bundle:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/icmp_echo: examples/protocols/icmp_echo:
disable: disable:
@@ -158,6 +169,7 @@ examples/protocols/mqtt/ssl:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/mqtt/ssl_ds: examples/protocols/mqtt/ssl_ds:
disable: disable:
@@ -186,6 +198,7 @@ examples/protocols/mqtt/tcp:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/mqtt/ws: examples/protocols/mqtt/ws:
disable: disable:
@@ -196,6 +209,7 @@ examples/protocols/mqtt/ws:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/mqtt/wss: examples/protocols/mqtt/wss:
disable: disable:
@@ -206,6 +220,7 @@ examples/protocols/mqtt/wss:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/mqtt5: examples/protocols/mqtt5:
disable: disable:
@@ -216,6 +231,7 @@ examples/protocols/mqtt5:
- if: IDF_TARGET != "esp32" - if: IDF_TARGET != "esp32"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/protocols/smtp_client: examples/protocols/smtp_client:
disable: disable:

View File

@@ -1,5 +1,11 @@
# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
.ethernet_dependencies: &ethernet_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: examples/system/app_trace_basic:
disable: disable:
- if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32p4"] - 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" - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/system/ota/native_ota_example: examples/system/ota/native_ota_example:
disable: disable:
@@ -161,6 +168,7 @@ examples/system/ota/native_ota_example:
- if: IDF_TARGET == "esp32c6" - if: IDF_TARGET == "esp32c6"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/system/ota/otatool: examples/system/ota/otatool:
disable: disable:
@@ -177,6 +185,7 @@ examples/system/ota/pre_encrypted_ota:
- if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
temporary: true temporary: true
reason: lack of runners reason: lack of runners
<<: *ethernet_dependencies
examples/system/ota/simple_ota_example: examples/system/ota/simple_ota_example:
disable: disable:

View File

@@ -52,6 +52,16 @@ tools/test_apps/protocols/mqtt/publish_connect_test:
- if: IDF_TARGET == "esp32s2" or IDF_TARGET == "esp32c3" - if: IDF_TARGET == "esp32s2" or IDF_TARGET == "esp32c3"
temporary: true temporary: true
reason: lack of runners 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: tools/test_apps/protocols/netif_components:
enable: enable: