From 2d7a09e6afc1efacdc0c6e10525ff340cb6d74b1 Mon Sep 17 00:00:00 2001
From: Hu Chao Ru <huchaoru@espressif.com>
Date: Thu, 14 Oct 2021 16:26:04 +0800
Subject: [PATCH] Revert "Merge branch
 'bugfix/set_authmode_by_switching_number_to_string_v4.0' into 'release/v4.0'"

This reverts merge request !14703
---
 .gitlab-ci.yml                                   | 2 +-
 components/idf_test/integration_test/KnownIssues | 2 --
 tools/ci/config/target-test.yml                  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c6720447c..209576fc79 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.3"
+  CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v3.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 0fe3647c50..8e3dad65e1 100644
--- a/components/idf_test/integration_test/KnownIssues
+++ b/components/idf_test/integration_test/KnownIssues
@@ -6,8 +6,6 @@ ESP32.BTSTK_MISC_0301
 ESP32.BTSTK_GATT_27002
 ESP32.BTSTK_GATT_27003
 
-ESP32.MESH_EST_2109
-
 ESP32.BLUEDROID_GAP_04005
 ESP32.BLUEDROID_GAP_05002
 ESP32.BLUEDROID_GAP_05003
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index ea0aa95cdd..86450ac21b 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -457,7 +457,7 @@ IT_002:
 
 IT_003:
   extends: .test_template
-  parallel: 16
+  parallel: 14
   tags:
     - ESP32_IDF
     - SSC_T2_5