From a1fd8065bd6a190e9a9d2356ddc4360bd3540cab Mon Sep 17 00:00:00 2001 From: chensheng Date: Mon, 11 Jul 2022 15:35:07 +0800 Subject: [PATCH] seperate ble wifi environment --- .gitlab/ci/README.md | 2 +- .gitlab/ci/dependencies/dependencies.yml | 10 +- .gitlab/ci/rules.yml | 60 +++++++- .gitlab/ci/target-test.yml | 188 ++++++++++++++++------- tools/ci/integration_test/KnownIssues | 3 + 5 files changed, 200 insertions(+), 63 deletions(-) diff --git a/.gitlab/ci/README.md b/.gitlab/ci/README.md index 8be5a52cd6..4090fc3387 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` +- `integration_test[_wifi/ble]` - `iperf_stress_test` - `macos` - `macos_test` diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 8c2bb7675d..c5c46e5c0f 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -113,13 +113,19 @@ build:integration_test: - "build:component_ut-{0}" - build:target_test -"test:integration_test": +"test:integration_test_{0}": + matrix: + - - wifi + - ble labels: + - integration_test_{0} - integration_test - target_test patterns: - - integration_test + - integration_test_{0} + # - maybe others included_in: + - test:integration_test - build:integration_test - build:target_test diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 05e3063e1c..66d394df4b 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -87,9 +87,19 @@ - "components/**/test_apps/**/*" -.patterns-integration_test: &patterns-integration_test - - "tools/ci/python_packages/tiny_test_fw/**/*" +.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/host/nimble/nimble" + - "components/esp_phy/lib" + +.patterns-integration_test_wifi: &patterns-integration_test_wifi + - "tools/ci/python_packages/gitlab_api.py" + - "tools/ci/integration_test/**/*" + - "components/esp_wifi/lib" + - "components/esp_phy/lib" .patterns-host_test: &patterns-host_test - ".gitlab/ci/host-test.yml" @@ -320,6 +330,12 @@ .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-iperf_stress_test: &if-label-iperf_stress_test if: '$BOT_LABEL_IPERF_STRESS_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*iperf_stress_test(?:,[^,\n\r]+)*$/i' @@ -627,13 +643,17 @@ - <<: *if-protected - <<: *if-label-build - <<: *if-label-integration_test + - <<: *if-label-integration_test_ble + - <<: *if-label-integration_test_wifi - <<: *if-label-target_test - <<: *if-dev-push changes: *patterns-build_components - <<: *if-dev-push changes: *patterns-build_system - <<: *if-dev-push - changes: *patterns-integration_test + changes: *patterns-integration_test_ble + - <<: *if-dev-push + changes: *patterns-integration_test_wifi .rules:build:macos: rules: @@ -664,6 +684,8 @@ - <<: *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-iperf_stress_test - <<: *if-label-target_test - <<: *if-label-unit_test @@ -685,7 +707,9 @@ - <<: *if-dev-push changes: *patterns-example_test - <<: *if-dev-push - changes: *patterns-integration_test + changes: *patterns-integration_test_ble + - <<: *if-dev-push + changes: *patterns-integration_test_wifi - <<: *if-dev-push changes: *patterns-unit_test @@ -952,9 +976,35 @@ - <<: *if-label-build-only when: never - <<: *if-label-integration_test + - <<: *if-label-integration_test_ble + - <<: *if-label-integration_test_wifi - <<: *if-label-target_test - <<: *if-dev-push - changes: *patterns-integration_test + changes: *patterns-integration_test_ble + - <<: *if-dev-push + changes: *patterns-integration_test_wifi + +.rules:test:integration_test_ble: + rules: + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-integration_test + - <<: *if-label-integration_test_ble + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-integration_test_ble + +.rules:test:integration_test_wifi: + rules: + - <<: *if-protected + - <<: *if-label-build-only + when: never + - <<: *if-label-integration_test + - <<: *if-label-integration_test_wifi + - <<: *if-label-target_test + - <<: *if-dev-push + changes: *patterns-integration_test_wifi .rules:test:submodule: rules: diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 07529d7b15..fdfb6f4f29 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -822,7 +822,9 @@ component_ut_test_lan8720: LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32C3_IDF" nvs_compatible_test: - extends: .integration_test_template + extends: + - .integration_test_template + - .rules:test:integration_test_wifi artifacts: when: always paths: @@ -851,122 +853,198 @@ nvs_compatible_test: - python ${PREPARE_TEST_BIN_SCRIPT} $CONFIG_FILE - python ${CI_RUNNER_SCRIPT} -l "$LOG_PATH/$JOB_FULL_NAME" -c $CONFIG_FILE -e $LOCAL_ENV_CONFIG_PATH -t $TEST_CASE_FILE_PATH -IT_001: - extends: .integration_test_template +IT_T1_Simple: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi parallel: 2 tags: - ESP32_IDF - - SSC_T1_4 + - SSC_T1_Simple -IT_002: - extends: .integration_test_template +IT_T1_WAP: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T1_2 + - SSC_T1_WAP -IT_003: - extends: .integration_test_template +IT_T2_Simple: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi parallel: 9 tags: - ESP32_IDF - - SSC_T2_5 + - SSC_T2_Simple -IT_005: - extends: .integration_test_template +IT_T5_BT_Simple: + extends: + - .integration_test_template + - .rules:test:integration_test_ble + parallel: 3 tags: - ESP32_IDF - - SSC_T1_5 + - SSC_T5_BT_Simple -IT_006: - extends: .integration_test_template +IT_T2_BT_Simple: + extends: + - .integration_test_template + - .rules:test:integration_test_ble + parallel: 6 + tags: + - ESP32_IDF + - SSC_T2_BT_Simple + +IT_T1_BT_Dongle: + extends: + - .integration_test_template + - .rules:test:integration_test_ble + parallel: 2 + tags: + - ESP32_IDF + - SSC_T1_BT_Dongle + +IT_T1_AP: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi + tags: + - ESP32_IDF + - SSC_T1_AP + +IT_T1_AP_E: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi parallel: 5 tags: - ESP32_IDF - - SSC_T1_6 + - SSC_T1_AP_E -IT_007: - extends: .integration_test_template +IT_T1_WNIC_AP: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T1_7 + - SSC_T1_WNIC_AP -IT_008: - extends: .integration_test_template +IT_T1_WNIC_AP_E: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T1_8 + - SSC_T1_WNIC_AP_E -IT_011: - extends: .integration_test_template +IT_T1_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - SSC_T1_MESH1 -IT_012: - extends: .integration_test_template +IT_T2_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi parallel: 2 tags: - ESP32_IDF - SSC_T2_MESH1 -IT_013: - extends: .integration_test_template +IT_T3_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - SSC_T3_MESH1 -IT_014: - extends: .integration_test_template +IT_T6_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - SSC_T6_MESH1 -IT_015: - extends: .integration_test_template +IT_T12_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - SSC_T12_MESH1 -IT_016: - extends: .integration_test_template +IT_T50_MESH1: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi allow_failure: true tags: - ESP32_IDF - SSC_T50_MESH1 -IT_017: - extends: .integration_test_template +IT_T1_MESH2: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - SSC_T1_MESH2 -IT_018: - extends: .integration_test_template +IT_T2_WNIC: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T1_9 + - SSC_T2_WNIC -IT_019: - extends: .integration_test_template +IT_T2_AP: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T2_2 + - SSC_T2_AP -IT_020: - extends: .integration_test_template +IT_T3_Simple: + extends: + - .integration_test_template + - .rules:test:integration_test_wifi tags: - ESP32_IDF - - SSC_T2_3 + - SSC_T3_Simple -IT_022: - extends: .integration_test_template - tags: - - ESP32_IDF - - SSC_T3_2 - -IT_C3_001: - extends: .integration_test_esp32c3_template - parallel: 6 +IT_C3_T2_BT_Simple: + extends: + - .integration_test_esp32c3_template + - .rules:test:integration_test_ble + parallel: 9 tags: - ESP32C3_IDF - - SSC_T2_5 + - SSC_T2_BT_Simple + +IT_C3_T5_BT_Simple: + extends: + - .integration_test_esp32c3_template + - .rules:test:integration_test_ble + parallel: 5 + tags: + - ESP32C3_IDF + - SSC_T5_BT_Simple + +IT_C3_T1_BT_Dongle: + extends: + - .integration_test_esp32c3_template + - .rules:test:integration_test_ble + image: gitlab.espressif.cn:5050/qa/dockerfiles/integration-test-env-dbg:1 + parallel: 2 + tags: + - ESP32C3_IDF + - SSC_T1_BT_Dongle diff --git a/tools/ci/integration_test/KnownIssues b/tools/ci/integration_test/KnownIssues index f5a1eeabd6..97e38e031d 100644 --- a/tools/ci/integration_test/KnownIssues +++ b/tools/ci/integration_test/KnownIssues @@ -1,5 +1,8 @@ # MESH ESP32.MESH_EST_2109 +# CI +ESP32.BLUEDROID_GAP_03003 +ESP32.NIMBLE_GAP_14007 ESP32C3.NIMBLE_GAP_14009 ESP32C3.NIMBLE_GAP_17021