From 4400846c61b67b886f5f9f1e733b9be465157f4c Mon Sep 17 00:00:00 2001 From: Chen Yudong Date: Tue, 24 Oct 2023 21:30:58 +0800 Subject: [PATCH 1/2] ci: remove unused integration test files --- .gitlab/ci/README.md | 2 +- .gitlab/ci/dependencies/dependencies.yml | 27 -------------------- .gitlab/ci/rules.yml | 32 ------------------------ tools/ci/integration_test/KnownIssues | 12 --------- tools/ci/integration_test/README.md | 12 --------- 5 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 tools/ci/integration_test/KnownIssues delete mode 100644 tools/ci/integration_test/README.md diff --git a/.gitlab/ci/README.md b/.gitlab/ci/README.md index a3ff2bbb98..ab138c0943 100644 --- a/.gitlab/ci/README.md +++ b/.gitlab/ci/README.md @@ -59,7 +59,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 87d3f53902..5905f5be9f 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -83,16 +83,6 @@ - "build:{0}" - build:target_test -build:integration_test: - labels: - - build - patterns: - - build_components - - build_system - included_in: - - build:target_test - - #################### # Target Test Jobs # #################### @@ -173,23 +163,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 9f39debe8b..9202f59ddc 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -112,22 +112,6 @@ .patterns-component_ut-wifi: &patterns-component_ut-wifi - "components/esp_wifi/**/*" -.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/??[!s][!t]*/**/*" - - "components/esp_coex/???/**/*" - - "components/esp_coex/*" - -.patterns-integration_test-wifi: &patterns-integration_test-wifi - - "tools/ci/python_packages/gitlab_api.py" - - "tools/ci/integration_test/**/*" - .patterns-build_macos: &patterns-build_macos - "tools/ci/test_configure_ci_environment.sh" @@ -571,15 +555,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-macos: &if-label-macos if: '$BOT_LABEL_MACOS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*macos(?:,[^,\n\r]+)*$/i' @@ -1584,9 +1559,6 @@ - <<: *if-label-example_test_esp32p4 - <<: *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-target_test - <<: *if-dev-push changes: *patterns-build-example_test @@ -1634,10 +1606,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 diff --git a/tools/ci/integration_test/KnownIssues b/tools/ci/integration_test/KnownIssues deleted file mode 100644 index 186b7a90c3..0000000000 --- a/tools/ci/integration_test/KnownIssues +++ /dev/null @@ -1,12 +0,0 @@ -# CI -ESP32.BLUEDROID_GAP_03003 -ESP32.NIMBLE_GAP_11002 -ESP32.NIMBLE_GAP_14007 - -ESP32C3.NIMBLE_GAP_14009 - -ESP32C2.NIMBLE_GAP_03001 -ESP32C2.NIMBLE_GAP_03004 -ESP32C2.BLUEDROID_GAP_23004 -ESP32C2.BLUEDROID_GAP_03001 -ESP32C2.BLUEDROID_GAP_03004 diff --git a/tools/ci/integration_test/README.md b/tools/ci/integration_test/README.md deleted file mode 100644 index 40d81e78c4..0000000000 --- a/tools/ci/integration_test/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Integration Test Description - -## Case Lists -- WiFi Standard cases for only esp32. -- BLE Standard cases for esp32 and esp32c3. - -## Trigger -- By labels: - - `integration_test[_wifi/ble]` -- By file changes: - - integration test related files - - See `patterns-integration_test[_wifi/ble]` in `.gitlab/ci/rules.yml` From 3c67e1ba01f362ec9628891d0cb0c69f4952fb19 Mon Sep 17 00:00:00 2001 From: Chen Yudong Date: Fri, 3 Nov 2023 18:13:34 +0800 Subject: [PATCH 2/2] ci: add label rules for integration test fix typo --- .gitlab/ci/integration_test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/integration_test.yml b/.gitlab/ci/integration_test.yml index 5b75a84a49..9ba8d77dab 100644 --- a/.gitlab/ci/integration_test.yml +++ b/.gitlab/ci/integration_test.yml @@ -8,7 +8,7 @@ - "tools/**/*" - ".gitlab-ci.yml" - ".gitlab/ci/common.yml" - - ".gitlab/ci/integration-test.yml" + - ".gitlab/ci/integration_test.yml" - ".gitmodules" - "CMakeLists.txt" - "install.sh" @@ -22,6 +22,10 @@ - if: '$CI_PIPELINE_SOURCE != "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *patterns-integration_test + # support trigger by ci labels + - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*target_test(?:,[^,\n\r]+)*$/i' + - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*integration_test(?:,[^,\n\r]+)*$/i' + - if: '$CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build(?:,[^,\n\r]+)*$/i' gen_integration_pipeline: extends: