Merge branch 'bugfix/set_authmode_by_switching_number_to_string_v4.4' into 'release/v4.4'

CI: change ap authmode from number to string (backport v4.4)

See merge request espressif/esp-idf!16553
This commit is contained in:
Jiang Jiang Jian 2022-01-26 11:53:30 +00:00
commit 56e854bb4e
3 changed files with 8 additions and 31 deletions

View File

@ -68,7 +68,7 @@ variables:
# target test repo parameters
TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git"
CI_AUTO_TEST_SCRIPT_REPO_URL: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/auto_test_script.git"
CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v3.1"
CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v4.1"
.setup_tools_unless_target_test: &setup_tools_unless_target_test |
if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then

View File

@ -822,7 +822,7 @@ nvs_compatible_test:
IT_001:
extends: .integration_test_template
parallel: 3
parallel: 2
tags:
- ESP32_IDF
- SSC_T1_4
@ -835,34 +835,26 @@ IT_002:
IT_003:
extends: .integration_test_template
parallel: 14
parallel: 9
tags:
- ESP32_IDF
- SSC_T2_5
IT_004:
extends: .integration_test_template
tags:
- ESP32_IDF
- SSC_T1_APC
IT_005:
extends: .integration_test_template
parallel: 2
tags:
- ESP32_IDF
- SSC_T1_5
IT_006:
extends: .integration_test_template
parallel: 12
parallel: 5
tags:
- ESP32_IDF
- SSC_T1_6
IT_007:
extends: .integration_test_template
parallel: 3
tags:
- ESP32_IDF
- SSC_T1_7
@ -873,12 +865,6 @@ IT_008:
- ESP32_IDF
- SSC_T1_8
IT_009:
extends: .integration_test_template
tags:
- ESP32_IDF
- SSC_T1_3
IT_011:
extends: .integration_test_template
tags:
@ -931,7 +917,6 @@ IT_018:
IT_019:
extends: .integration_test_template
parallel: 2
tags:
- ESP32_IDF
- SSC_T2_2
@ -942,8 +927,8 @@ IT_020:
- ESP32_IDF
- SSC_T2_3
IT_021:
IT_022:
extends: .integration_test_template
tags:
- ESP32_IDF
- SSC_T2_4
- SSC_T3_2

View File

@ -1,10 +1,2 @@
# BT heap size issue
ESP32.BTSTK_MISC_0301
# GATT read multiple
ESP32.BTSTK_GATT_27002
ESP32.BTSTK_GATT_27003
# CI
ESP32.BLUEDROID_GAP_04005
# MESH
ESP32.MESH_EST_2109