diff --git a/.gitlab/ci/README.md b/.gitlab/ci/README.md index d5005682eb..e169e7474b 100644 --- a/.gitlab/ci/README.md +++ b/.gitlab/ci/README.md @@ -51,7 +51,7 @@ - `example_test[_esp32/esp32s2/...]` - `fuzzer_test` - `host_test` -- `integration_test[_wifi/ble]` +- `integration_test` - `iperf_stress_test` - `macos` - `macos_test` diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 8220351063..1e198c49fb 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -75,16 +75,6 @@ - "build:{0}" - build:target_test -build:integration_test: - labels: - - build - patterns: - - build_components - - build_system - included_in: - - build:target_test - - #################### # Target Test Jobs # #################### @@ -182,23 +172,6 @@ build:integration_test: - "build:example_test" - build:target_test -"test:integration_test_{0}": - matrix: - - - wifi - - ble - labels: - - integration_test_{0} - - integration_test - - target_test - patterns: - - integration_test-{0} - - target_test-{0} - # - maybe others - included_in: - - test:integration_test - - build:integration_test - - build:target_test - "test:host_test": labels: - host_test diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 4be36e0457..795d8e4dc6 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -104,20 +104,6 @@ - "components/wpa_supplicant/**/*" - "components/esp_coex/**/*" -.patterns-integration_test-ble: &patterns-integration_test-ble - - "tools/ci/python_packages/gitlab_api.py" - - "tools/ci/integration_test/**/*" - - "components/bt/controller/lib_esp32" - - "components/bt/controller/lib_esp32c3_family" - - "components/bt/controller/lib_esp32h2/esp32h2-bt-lib" - - "components/bt/host/nimble/nimble" - - "components/esp_phy/lib" - - "components/esp_coex/**/*" - -.patterns-integration_test-wifi: &patterns-integration_test-wifi - - "tools/ci/python_packages/gitlab_api.py" - - "tools/ci/integration_test/**/*" - .patterns-host_test: &patterns-host_test - ".gitlab/ci/host-test.yml" @@ -542,15 +528,6 @@ .if-label-host_test: &if-label-host_test if: '$BOT_LABEL_HOST_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*host_test(?:,[^,\n\r]+)*$/i' -.if-label-integration_test: &if-label-integration_test - if: '$BOT_LABEL_INTEGRATION_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test(?:,[^,\n\r]+)*$/i' - -.if-label-integration_test_ble: &if-label-integration_test_ble - if: '$BOT_LABEL_INTEGRATION_TEST_BLE || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test_ble(?:,[^,\n\r]+)*$/i' - -.if-label-integration_test_wifi: &if-label-integration_test_wifi - if: '$BOT_LABEL_INTEGRATION_TEST_WIFI || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test_wifi(?:,[^,\n\r]+)*$/i' - .if-label-lan8720: &if-label-lan8720 if: '$BOT_LABEL_LAN8720 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*lan8720(?:,[^,\n\r]+)*$/i' @@ -1514,9 +1491,6 @@ - <<: *if-label-example_test_esp32h2 - <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s3 - - <<: *if-label-integration_test - - <<: *if-label-integration_test_ble - - <<: *if-label-integration_test_wifi - <<: *if-label-lan8720 - <<: *if-label-target_test - <<: *if-label-unit_test @@ -1561,10 +1535,6 @@ changes: *patterns-example_test-usb - <<: *if-dev-push changes: *patterns-example_test-wifi - - <<: *if-dev-push - changes: *patterns-integration_test-ble - - <<: *if-dev-push - changes: *patterns-integration_test-wifi - <<: *if-dev-push changes: *patterns-target_test-adc - <<: *if-dev-push