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

bugfix: set authmode by switching number to string (backport v4.0)

See merge request espressif/esp-idf!14703
This commit is contained in:
Jiang Jiang Jian
2021-10-13 04:01:39 +00:00
3 changed files with 4 additions and 2 deletions

View File

@@ -58,7 +58,7 @@ variables:
# target test repo parameters # 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" 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_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/v3.3"
# Versioned esp-idf-doc env image to use for all document building jobs # Versioned esp-idf-doc env image to use for all document building jobs
ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v7" ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v7"

View File

@@ -6,6 +6,8 @@ ESP32.BTSTK_MISC_0301
ESP32.BTSTK_GATT_27002 ESP32.BTSTK_GATT_27002
ESP32.BTSTK_GATT_27003 ESP32.BTSTK_GATT_27003
ESP32.MESH_EST_2109
ESP32.BLUEDROID_GAP_04005 ESP32.BLUEDROID_GAP_04005
ESP32.BLUEDROID_GAP_05002 ESP32.BLUEDROID_GAP_05002
ESP32.BLUEDROID_GAP_05003 ESP32.BLUEDROID_GAP_05003

View File

@@ -457,7 +457,7 @@ IT_002:
IT_003: IT_003:
extends: .test_template extends: .test_template
parallel: 14 parallel: 16
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T2_5 - SSC_T2_5