From 6df29acf3920fffa6e23f880e09dbd459df39ee6 Mon Sep 17 00:00:00 2001 From: Chen Yudong Date: Tue, 24 Oct 2023 21:40:38 +0800 Subject: [PATCH] ci: add label rules for integration test --- .gitlab/ci/README.md | 2 +- .gitlab/ci/integration_test.yml | 6 +++++- .../test_configs/nvs_compatible_test_.yml | 11 ----------- 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 tools/ci/integration_test/test_configs/nvs_compatible_test_.yml diff --git a/.gitlab/ci/README.md b/.gitlab/ci/README.md index f7ae084088..59d0d572f4 100644 --- a/.gitlab/ci/README.md +++ b/.gitlab/ci/README.md @@ -48,7 +48,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/integration_test.yml b/.gitlab/ci/integration_test.yml index 25faa4df9b..3107932cdc 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: diff --git a/tools/ci/integration_test/test_configs/nvs_compatible_test_.yml b/tools/ci/integration_test/test_configs/nvs_compatible_test_.yml deleted file mode 100644 index 582774492d..0000000000 --- a/tools/ci/integration_test/test_configs/nvs_compatible_test_.yml +++ /dev/null @@ -1,11 +0,0 @@ -BinPath: - path: SSC/ssc_bin/ESP32/SSC_BLE_WIFI - test app: SSC_BLE_WIFI - -DUT: [SSC1] - -Filter: -- Add: - SDK: ESP32_IDF - Test App: SSC_BLE_WIFI - summary: 'use old NVS data WIFI function test'