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

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

CI: set authmode by switching number to string (backport v4.2)

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

+ 1 - 1
.gitlab-ci.yml

@@ -58,7 +58,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"
 
   # 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"

+ 2 - 15
components/idf_test/integration_test/KnownIssues

@@ -1,15 +1,2 @@
-
-# BT heap size issue
-ESP32.BTSTK_MISC_0301
-
-# GATT read multiple
-ESP32.BTSTK_GATT_27002
-ESP32.BTSTK_GATT_27003	
-
-# Mesh establish network T50
-ESP32.MESH_EST_0216
-
-ESP32.BTSTK_MISC_0504
-ESP32.BTSTK_MISC_0505
-ESP32.BTSTK_MISC_0506
-ESP32.BTSTK_MISC_0507
+# MESH
+ESP32.MESH_EST_2109

+ 5 - 20
tools/ci/config/target-test.yml

@@ -626,7 +626,7 @@ nvs_compatible_test:
 
 IT_001:
   extends: .test_template
-  parallel: 3
+  parallel: 2
   tags:
     - ESP32_IDF
     - SSC_T1_4
@@ -639,34 +639,26 @@ IT_002:
 
 IT_003:
   extends: .test_template
-  parallel: 14
+  parallel: 9
   tags:
     - ESP32_IDF
     - SSC_T2_5
 
-IT_004:
-  extends: .test_template
-  tags:
-    - ESP32_IDF
-    - SSC_T1_APC
-
 IT_005:
   extends: .test_template
-  parallel: 2
   tags:
     - ESP32_IDF
     - SSC_T1_5
 
 IT_006:
   extends: .test_template
-  parallel: 12
+  parallel: 5
   tags:
     - ESP32_IDF
     - SSC_T1_6
 
 IT_007:
   extends: .test_template
-  parallel: 3
   tags:
     - ESP32_IDF
     - SSC_T1_7
@@ -677,12 +669,6 @@ IT_008:
     - ESP32_IDF
     - SSC_T1_8
 
-IT_009:
-  extends: .test_template
-  tags:
-    - ESP32_IDF
-    - SSC_T1_3
-
 IT_011:
   extends: .test_template
   tags:
@@ -735,7 +721,6 @@ IT_018:
 
 IT_019:
   extends: .test_template
-  parallel: 2
   tags:
     - ESP32_IDF
     - SSC_T2_2
@@ -746,8 +731,8 @@ IT_020:
     - ESP32_IDF
     - SSC_T2_3
 
-IT_021:
+IT_022:
   extends: .test_template
   tags:
     - ESP32_IDF
-    - SSC_T2_4
+    - SSC_T3_2