From 675a9f95fc2bbd87af27f340e04c06851c755fbc Mon Sep 17 00:00:00 2001
From: huchaoru <huchaoru@espressif.com>
Date: Thu, 22 Jul 2021 11:24:11 +0800
Subject: [PATCH] CI: change ap authmode from number to string

---
 .gitlab-ci.yml                                |  2 +-
 .gitlab/ci/target-test.yml                    | 25 ++++---------------
 .../idf_test/integration_test/KnownIssues     | 13 +++-------
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 298701299d..89281eb612 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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"
   PYTEST_EMBEDDED_TAG: "v0.4.5"
 
 .setup_tools_unless_target_test: &setup_tools_unless_target_test |
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 5364d25056..a74b8ce75c 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -876,7 +876,7 @@ nvs_compatible_test:
 
 IT_001:
   extends: .integration_test_template
-  parallel: 3
+  parallel: 2
   tags:
     - ESP32_IDF
     - SSC_T1_4
@@ -889,34 +889,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
@@ -927,12 +919,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:
@@ -985,7 +971,6 @@ IT_018:
 
 IT_019:
   extends: .integration_test_template
-  parallel: 2
   tags:
     - ESP32_IDF
     - SSC_T2_2
@@ -996,8 +981,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
diff --git a/components/idf_test/integration_test/KnownIssues b/components/idf_test/integration_test/KnownIssues
index 73f7e7a774..9f04404f1f 100644
--- a/components/idf_test/integration_test/KnownIssues
+++ b/components/idf_test/integration_test/KnownIssues
@@ -1,10 +1,5 @@
-
-# BT heap size issue
-ESP32.BTSTK_MISC_0301
-
-# GATT read multiple
-ESP32.BTSTK_GATT_27002
-ESP32.BTSTK_GATT_27003
-
 # CI
-ESP32.BLUEDROID_GAP_04005
+ESP32.NIMBLE_GATT_60015
+ESP32.BLUEDROID_GAP_03003
+ESP32.BTPROF_A2DP_04011
+ESP32.BTPROF_A2DP_05011