Просмотр исходного кода

Merge branch 'revert-f9a5e259' into 'release/v4.0'

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

See merge request espressif/esp-idf!15522
Jiang Jiang Jian 4 лет назад
Родитель
Сommit
c8e00a81dd
3 измененных файлов с 2 добавлено и 4 удалено
  1. 1 1
      .gitlab-ci.yml
  2. 0 2
      components/idf_test/integration_test/KnownIssues
  3. 1 1
      tools/ci/config/target-test.yml

+ 1 - 1
.gitlab-ci.yml

@@ -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.3"
+  CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v3.1"
 
 
 # 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"

+ 0 - 2
components/idf_test/integration_test/KnownIssues

@@ -6,8 +6,6 @@ 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

+ 1 - 1
tools/ci/config/target-test.yml

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