blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

seperate ble wifi environment and support ci esp32c2 (backport v5.0)

Browse Source
This commit is contained in:
Chen Sheng 2022-12-12 16:36:20 +08:00 committed by Island
parent 4fb6f42120
commit 96ff16199a
9 changed files with 352 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/README.md
View File

@ -56,7 +56,7 @@
- `example_test[_esp32/esp32s2/...]` - `example_test[_esp32/esp32s2/...]`
- `fuzzer_test` - `fuzzer_test`
- `host_test` - `host_test`
- `integration_test` - `integration_test[_wifi/ble]`
- `iperf_stress_test` - `iperf_stress_test`
- `macos` - `macos`
- `macos_test` - `macos_test`

1
.gitlab/ci/assign-test.yml
View File

@ -90,6 +90,7 @@ assign_integration_test:
needs: needs:
- build_ssc_esp32 - build_ssc_esp32
- build_ssc_esp32c3 - build_ssc_esp32c3
- build_ssc_esp32c2
artifacts: artifacts:
paths: paths:
- $TEST_DIR/test_configs - $TEST_DIR/test_configs

11
.gitlab/ci/dependencies/dependencies.yml
View File

@ -155,13 +155,20 @@ build:integration_test:
- "build:example_test" - "build:example_test"
- build:target_test - build:target_test
"test:integration_test": "test:integration_test_{0}":
matrix:
- - wifi
- ble
labels: labels:
- integration_test_{0}
- integration_test - integration_test
- target_test - target_test
patterns: patterns:
- integration_test - integration_test-{0}
- target_test-{0}
# - maybe others
included_in: included_in:
- test:integration_test
- build:integration_test - build:integration_test
- build:target_test - build:target_test

182
.gitlab/ci/rules.yml
View File

@ -79,17 +79,26 @@
- "components/**/*" - "components/**/*"
.patterns-integration_test: &patterns-integration_test .patterns-target_test-wifi: &patterns-target_test-wifi
- "components/esp_netif/**/*"
- "components/lwip/**/*"
- "components/esp_wifi/**/*"
- "components/esp_phy/**/*"
- "components/wpa_supplicant/**/*"
.patterns-integration_test-ble: &patterns-integration_test-ble
- "tools/ci/python_packages/gitlab_api.py" - "tools/ci/python_packages/gitlab_api.py"
- "tools/ci/integration_test/**/*" - "tools/ci/integration_test/**/*"
- "components/bt/controller/lib_esp32" - "components/bt/controller/lib_esp32"
- "components/bt/controller/lib_esp32c3_family" - "components/bt/controller/lib_esp32c3_family"
- "components/bt/controller/lib_esp32h2/esp32h2-bt-lib" - "components/bt/controller/lib_esp32h2/esp32h2-bt-lib"
- "components/bt/host/nimble/nimble" - "components/bt/host/nimble/nimble"
- "components/esp_wifi/lib"
- "components/esp_phy/lib" - "components/esp_phy/lib"
.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 .patterns-host_test: &patterns-host_test
- ".gitlab/ci/host-test.yml" - ".gitlab/ci/host-test.yml"
@ -203,11 +212,6 @@
- "examples/wifi/**/*" - "examples/wifi/**/*"
- "examples/network/simple_sniffer/**/*" - "examples/network/simple_sniffer/**/*"
- "components/esp_phy/**/*"
- "components/esp_wifi/**/*"
- "components/esp_netif/**/*"
- "components/lwip/**/*"
# for cases with wifi_high_traffic marker # for cases with wifi_high_traffic marker
- "examples/system/ota/**/*" - "examples/system/ota/**/*"
- "components/app_update/**/*" - "components/app_update/**/*"
@ -417,6 +421,12 @@
.if-label-integration_test: &if-label-integration_test .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: '$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-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' if: '$BOT_LABEL_IPERF_STRESS_TEST || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*iperf_stress_test(?:,[^,\n\r]+)*$/i'
@ -506,6 +516,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32: .rules:build:component_ut-esp32:
rules: rules:
@ -527,6 +539,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32c2: .rules:build:component_ut-esp32c2:
rules: rules:
@ -547,6 +561,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32c3: .rules:build:component_ut-esp32c3:
rules: rules:
@ -567,6 +583,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32h2: .rules:build:component_ut-esp32h2:
rules: rules:
@ -587,6 +605,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32s2: .rules:build:component_ut-esp32s2:
rules: rules:
@ -607,6 +627,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:component_ut-esp32s3: .rules:build:component_ut-esp32s3:
rules: rules:
@ -627,6 +649,8 @@
changes: *patterns-component_ut changes: *patterns-component_ut
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-component_ut-adc changes: *patterns-component_ut-adc
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test: .rules:build:custom_test:
rules: rules:
@ -649,6 +673,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32: .rules:build:custom_test-esp32:
rules: rules:
@ -666,6 +692,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32c2: .rules:build:custom_test-esp32c2:
rules: rules:
@ -682,6 +710,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32c3: .rules:build:custom_test-esp32c3:
rules: rules:
@ -698,6 +728,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32h2: .rules:build:custom_test-esp32h2:
rules: rules:
@ -714,6 +746,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32s2: .rules:build:custom_test-esp32s2:
rules: rules:
@ -730,6 +764,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:custom_test-esp32s3: .rules:build:custom_test-esp32s3:
rules: rules:
@ -746,6 +782,8 @@
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-custom_test changes: *patterns-custom_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:docker: .rules:build:docker:
rules: rules:
@ -787,6 +825,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32: .rules:build:example_test-esp32:
rules: rules:
@ -813,6 +853,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32c2: .rules:build:example_test-esp32c2:
rules: rules:
@ -837,6 +879,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32c3: .rules:build:example_test-esp32c3:
rules: rules:
@ -862,6 +906,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32h2: .rules:build:example_test-esp32h2:
rules: rules:
@ -886,6 +932,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32s2: .rules:build:example_test-esp32s2:
rules: rules:
@ -910,6 +958,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:example_test-esp32s3: .rules:build:example_test-esp32s3:
rules: rules:
@ -934,6 +984,8 @@
changes: *patterns-example_test-ethernet changes: *patterns-example_test-ethernet
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:build:integration_test: .rules:build:integration_test:
rules: rules:
@ -942,13 +994,19 @@
- <<: *if-protected - <<: *if-protected
- <<: *if-label-build - <<: *if-label-build
- <<: *if-label-integration_test - <<: *if-label-integration_test
- <<: *if-label-integration_test_ble
- <<: *if-label-integration_test_wifi
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push - <<: *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-target_test-wifi
.rules:build:macos: .rules:build:macos:
rules: rules:
@ -990,6 +1048,8 @@
- <<: *if-label-example_test_esp32s2 - <<: *if-label-example_test_esp32s2
- <<: *if-label-example_test_esp32s3 - <<: *if-label-example_test_esp32s3
- <<: *if-label-integration_test - <<: *if-label-integration_test
- <<: *if-label-integration_test_ble
- <<: *if-label-integration_test_wifi
- <<: *if-label-iperf_stress_test - <<: *if-label-iperf_stress_test
- <<: *if-label-lan8720 - <<: *if-label-lan8720
- <<: *if-label-target_test - <<: *if-label-target_test
@ -1022,7 +1082,11 @@
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push - <<: *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-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1047,6 +1111,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1066,6 +1132,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1084,6 +1152,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1102,6 +1172,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1120,6 +1192,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1138,6 +1212,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1156,6 +1232,8 @@
changes: *patterns-build_components changes: *patterns-build_components
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-build_system changes: *patterns-build_system
- <<: *if-dev-push
changes: *patterns-target_test-wifi
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-unit_test changes: *patterns-unit_test
- <<: *if-dev-push - <<: *if-dev-push
@ -1276,6 +1354,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32 - <<: *if-label-component_ut_esp32
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:component_ut-esp32c2: .rules:test:component_ut-esp32c2:
rules: rules:
@ -1348,6 +1428,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32c2 - <<: *if-label-component_ut_esp32c2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:component_ut-esp32c3: .rules:test:component_ut-esp32c3:
rules: rules:
@ -1420,6 +1502,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32c3 - <<: *if-label-component_ut_esp32c3
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:component_ut-esp32h2: .rules:test:component_ut-esp32h2:
rules: rules:
@ -1492,6 +1576,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32h2 - <<: *if-label-component_ut_esp32h2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:component_ut-esp32s2: .rules:test:component_ut-esp32s2:
rules: rules:
@ -1564,6 +1650,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32s2 - <<: *if-label-component_ut_esp32s2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:component_ut-esp32s3: .rules:test:component_ut-esp32s3:
rules: rules:
@ -1636,6 +1724,8 @@
- <<: *if-label-component_ut - <<: *if-label-component_ut
- <<: *if-label-component_ut_esp32s3 - <<: *if-label-component_ut_esp32s3
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32: .rules:test:custom_test-esp32:
rules: rules:
@ -1704,6 +1794,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32 - <<: *if-label-custom_test_esp32
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32c2: .rules:test:custom_test-esp32c2:
rules: rules:
@ -1772,6 +1864,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32c2 - <<: *if-label-custom_test_esp32c2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32c3: .rules:test:custom_test-esp32c3:
rules: rules:
@ -1840,6 +1934,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32c3 - <<: *if-label-custom_test_esp32c3
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32h2: .rules:test:custom_test-esp32h2:
rules: rules:
@ -1908,6 +2004,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32h2 - <<: *if-label-custom_test_esp32h2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32s2: .rules:test:custom_test-esp32s2:
rules: rules:
@ -1976,6 +2074,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32s2 - <<: *if-label-custom_test_esp32s2
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:custom_test-esp32s3: .rules:test:custom_test-esp32s3:
rules: rules:
@ -2044,6 +2144,8 @@
- <<: *if-label-custom_test - <<: *if-label-custom_test
- <<: *if-label-custom_test_esp32s3 - <<: *if-label-custom_test_esp32s3
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32: .rules:test:example_test-esp32:
rules: rules:
@ -2129,6 +2231,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32c2: .rules:test:example_test-esp32c2:
rules: rules:
@ -2205,6 +2309,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32c3: .rules:test:example_test-esp32c3:
rules: rules:
@ -2290,6 +2396,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32h2: .rules:test:example_test-esp32h2:
rules: rules:
@ -2366,6 +2474,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32s2: .rules:test:example_test-esp32s2:
rules: rules:
@ -2442,6 +2552,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:example_test-esp32s3: .rules:test:example_test-esp32s3:
rules: rules:
@ -2518,6 +2630,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *if-dev-push
changes: *patterns-example_test-wifi changes: *patterns-example_test-wifi
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:host_test: .rules:test:host_test:
rules: rules:
@ -2538,9 +2652,43 @@
- <<: *if-label-build-only - <<: *if-label-build-only
when: never when: never
- <<: *if-label-integration_test - <<: *if-label-integration_test
- <<: *if-label-integration_test_ble
- <<: *if-label-integration_test_wifi
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-dev-push - <<: *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-target_test-wifi
.rules:test:integration_test_ble:
rules:
- <<: *if-revert-branch
when: never
- <<: *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-revert-branch
when: never
- <<: *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
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:submodule: .rules:test:submodule:
rules: rules:
@ -2622,6 +2770,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32 - <<: *if-label-unit_test_esp32
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:unit_test-esp32c2: .rules:test:unit_test-esp32c2:
rules: rules:
@ -2692,6 +2842,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32c2 - <<: *if-label-unit_test_esp32c2
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:unit_test-esp32c3: .rules:test:unit_test-esp32c3:
rules: rules:
@ -2762,6 +2914,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32c3 - <<: *if-label-unit_test_esp32c3
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:unit_test-esp32h2: .rules:test:unit_test-esp32h2:
rules: rules:
@ -2832,6 +2986,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32h2 - <<: *if-label-unit_test_esp32h2
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:unit_test-esp32s2: .rules:test:unit_test-esp32s2:
rules: rules:
@ -2902,6 +3058,8 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32s2 - <<: *if-label-unit_test_esp32s2
- <<: *if-dev-push
changes: *patterns-target_test-wifi
.rules:test:unit_test-esp32s3: .rules:test:unit_test-esp32s3:
rules: rules:
@ -2972,3 +3130,5 @@
- <<: *if-label-target_test - <<: *if-label-target_test
- <<: *if-label-unit_test - <<: *if-label-unit_test
- <<: *if-label-unit_test_esp32s3 - <<: *if-label-unit_test_esp32s3
- <<: *if-dev-push
changes: *patterns-target_test-wifi

215
.gitlab/ci/target-test.yml
View File

@ -1075,7 +1075,7 @@ UT_S3_FLASH:
CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/tools/ci/integration_test/test_configs" CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/tools/ci/integration_test/test_configs"
KNOWN_ISSUE_FILE: "${CI_PROJECT_DIR}/tools/ci/integration_test/KnownIssues" KNOWN_ISSUE_FILE: "${CI_PROJECT_DIR}/tools/ci/integration_test/KnownIssues"
CI_RUNNER_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/bin/CIRunner.py" CI_RUNNER_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/bin/CIRunner.py"
PREPARE_TEST_BIN_SCRIPT: "${CI_PROJECT_DIR}/tools/ci/integration_test/prepare_test_bins.py" PREPARE_TEST_BIN_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/tools/ci/idf_prepare_test_bins.py"
PYTHONPATH: "${CI_PROJECT_DIR}/auto_test_script/packages:${CI_PROJECT_DIR}/tools/ci/python_packages:${PYTHONPATH}" PYTHONPATH: "${CI_PROJECT_DIR}/auto_test_script/packages:${CI_PROJECT_DIR}/tools/ci/python_packages:${PYTHONPATH}"
INITIAL_CONDITION_RETRY_COUNT: "1" INITIAL_CONDITION_RETRY_COUNT: "1"
GIT_LFS_SKIP_SMUDGE: 1 GIT_LFS_SKIP_SMUDGE: 1
@ -1104,8 +1104,16 @@ UT_S3_FLASH:
variables: variables:
LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32C3_IDF" LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32C3_IDF"
.integration_test_esp32c2_template:
extends:
- .integration_test_template
variables:
LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32C2_IDF"
nvs_compatible_test: nvs_compatible_test:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test
artifacts: artifacts:
when: always when: always
paths: paths:
@ -1134,122 +1142,217 @@ nvs_compatible_test:
- python ${PREPARE_TEST_BIN_SCRIPT} $CONFIG_FILE - 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 - 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: IT_T1_Simple:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
parallel: 2 parallel: 2
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_4 - SSC_T1_Simple
IT_002: IT_T1_WAP:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_2 - SSC_T1_WAP
IT_003: IT_T2_Simple:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
parallel: 9 parallel: 9
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_5 - SSC_T2_Simple
IT_005: IT_T5_BT_Simple:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_ble
parallel: 3
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_5 - SSC_T5_BT_Simple
IT_006: IT_T2_BT_Simple:
extends: .integration_test_template 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 parallel: 5
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_6 - SSC_T1_AP_E
IT_007: IT_T1_WNIC_AP:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_7 - SSC_T1_WNIC_AP
IT_008: IT_T1_WNIC_AP_E:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_8 - SSC_T1_WNIC_AP_E
IT_011: IT_T1_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_MESH1 - SSC_T1_MESH1
IT_012: IT_T2_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
parallel: 2 parallel: 2
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_MESH1 - SSC_T2_MESH1
IT_013: IT_T3_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T3_MESH1 - SSC_T3_MESH1
IT_014: IT_T6_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T6_MESH1 - SSC_T6_MESH1
IT_015: IT_T12_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T12_MESH1 - SSC_T12_MESH1
IT_016: IT_T50_MESH1:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
allow_failure: true allow_failure: true
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T50_MESH1 - SSC_T50_MESH1
IT_017: IT_T1_MESH2:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_MESH2 - SSC_T1_MESH2
IT_018: IT_T2_WNIC:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_9 - SSC_T2_WNIC
IT_019: IT_T2_AP:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_2 - SSC_T2_AP
IT_020: IT_T3_Simple:
extends: .integration_test_template extends:
- .integration_test_template
- .rules:test:integration_test_wifi
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_3 - SSC_T3_Simple
IT_022: IT_C3_T2_BT_Simple:
extends: .integration_test_template extends:
tags: - .integration_test_esp32c3_template
- ESP32_IDF - .rules:test:integration_test_ble
- SSC_T3_2 parallel: 11
IT_C3_001:
extends: .integration_test_esp32c3_template
parallel: 6
tags: tags:
- ESP32C3_IDF - 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
IT_C2_T2_BT_Simple:
extends:
- .integration_test_esp32c2_template
- .rules:test:integration_test_ble
parallel: 9
tags:
- ESP32C2_IDF
- SSC_T2_BT_Simple
IT_C2_T1_BT_Dongle:
extends:
- .integration_test_esp32c2_template
- .rules:test:integration_test_ble
image: gitlab.espressif.cn:5050/qa/dockerfiles/integration-test-env-dbg:1
parallel: 2
tags:
- ESP32C2_IDF
- SSC_T1_BT_Dongle

12
tools/ci/integration_test/KnownIssues
View File

@ -1,7 +1,13 @@
# CI # CI
ESP32.NIMBLE_GATT_60015
ESP32.BLUEDROID_GAP_03003 ESP32.BLUEDROID_GAP_03003
ESP32.BTPROF_A2DP_04011 ESP32.NIMBLE_GAP_11002
ESP32.BTPROF_A2DP_05011 ESP32.NIMBLE_GAP_14007
ESP32C3.NIMBLE_GAP_14009 ESP32C3.NIMBLE_GAP_14009
ESP32C3.NIMBLE_GAP_17021
ESP32C2.NIMBLE_GAP_03001
ESP32C2.NIMBLE_GAP_03004
ESP32C2.BLUEDROID_GAP_23004
ESP32C2.BLUEDROID_GAP_03001
ESP32C2.BLUEDROID_GAP_03004

13
tools/ci/integration_test/README.md
View File

@ -6,16 +6,7 @@
## Trigger ## Trigger
- By labels: - By labels:
- `integration_test` - `integration_test[_wifi/ble]`
- By file changes: - By file changes:
- integration test related files - integration test related files
- By bot: - See `patterns-integration_test[_wifi/ble]` in `.gitlab/ci/rules.yml`
- `@bot test with label: integration_test`
## Advanced
- There are labels can be used to run less integration test cases.
- These labels only take effect when the integration test has been triggered.
- label: `integration::wifi_only`
- Only run WiFi cases.
- label: `integration::ble_only`
- Only run BLE cases.

74
tools/ci/integration_test/prepare_test_bins.py
View File

@ -1,74 +0,0 @@
#!/usr/bin/env python
#
# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import argparse
import os
import gitlab
try:
import gitlab_api
except ImportError:
import sys
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python_packages'))
import gitlab_api
from AutoTestScript.RunnerConfigs.Config import Config
SSC_BUILD_JOB_MAP = {
'ESP32': 'build_ssc_esp32',
'ESP32C3': 'build_ssc_esp32c3',
}
NEEDED_FILES = [
'flasher_args.json',
'bootloader/bootloader.bin',
'partition_table/partition-table.bin',
'ssc.bin',
'ssc.elf',
]
IDF_PATH = os.environ.get('IDF_PATH')
def try_to_download_artifacts(bin_path: str) -> None:
'''
bin_path: "SSC/ssc_bin/ESP32[C3]/SSC[_APP]"
'''
project_id = os.getenv('CI_PROJECT_ID')
pipeline_id = os.getenv('CI_PIPELINE_ID')
gitlab_inst = gitlab_api.Gitlab(project_id)
build_job_name = SSC_BUILD_JOB_MAP[bin_path.split('/')[-2]]
job_list = gitlab_inst.find_job_id(build_job_name, pipeline_id=pipeline_id)
files_to_download = [os.path.join(bin_path, f) for f in NEEDED_FILES]
for job_info in job_list:
try:
gitlab_inst.download_artifact(job_info['id'], files_to_download, IDF_PATH)
print('Downloaded {} from {}'.format(bin_path, job_info['id']))
break
except gitlab.exceptions.GitlabError as e:
if e.response_code == 404:
continue
raise
def main() -> None:
parser = argparse.ArgumentParser()
parser.add_argument(
'test_config_file',
help='The test config file to be used.'
)
args = parser.parse_args()
configs = Config.parse(args.test_config_file)
test_bin_paths = configs.get_bin_paths()
for _path in test_bin_paths:
if os.path.exists(_path):
continue
relative_path = os.path.relpath(_path, IDF_PATH)
try_to_download_artifacts(relative_path)
if __name__ == '__main__':
main()

11
tools/ci/integration_test/test_configs/nvs_compatible_test_.yml
View File

@ -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'