From fac6a5af5bf10ff0732f21ef4472d9c48c05a5f0 Mon Sep 17 00:00:00 2001
From: huchaoru <huchaoru@espressif.com>
Date: Fri, 6 Aug 2021 16:39:57 +0800
Subject: [PATCH] bugfix: set authmode by switching number to string (backport
 v4.2)

---
 .gitlab-ci.yml                                |  2 +-
 .../idf_test/integration_test/KnownIssues     | 17 ++-----------
 tools/ci/config/target-test.yml               | 25 ++++---------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bec2ec34b9..c4709afb23 100644
--- a/.gitlab-ci.yml
+++ b/.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"
diff --git a/components/idf_test/integration_test/KnownIssues b/components/idf_test/integration_test/KnownIssues
index 762e02a5a3..5b91d4389c 100644
--- a/components/idf_test/integration_test/KnownIssues
+++ b/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
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 8497f8ef4e..f3b22b68e9 100644
--- a/tools/ci/config/target-test.yml
+++ b/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