From 725eba337843d721fca60492721841c0a597af85 Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Sun, 25 Aug 2019 14:09:17 +0800
Subject: [PATCH 1/2] test: fix nvs compatible case error:

use new env tag for nvs compatible test case and update test config
file.
---
 .../integration_test/CIConfigs/nvs_compatible_test.yml      | 6 +++---
 components/idf_test/integration_test/TC_IT_SYS_NVS.yml      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml b/components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml
index 6318d4e425..917efd7481 100644
--- a/components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml
+++ b/components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml
@@ -1,11 +1,11 @@
 BinPath: 
-    path: SSC/ssc_bin/ESP32_IDF/SSC_BLE
-    test app: SSC_BLE
+    path: SSC/ssc_bin/ESP32_IDF/SSC_BLE_WIFI
+    test app: SSC_BLE_WIFI
 
 DUT: [SSC1]
 
 Filter:
 - Add:
     SDK: ESP32_IDF
-    Test App: SSC_BLE
+    Test App: SSC_BLE_WIFI
     summary: 'use old NVS data WIFI function test'
diff --git a/components/idf_test/integration_test/TC_IT_SYS_NVS.yml b/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
index fd7db6d73e..33682a8513 100644
--- a/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
+++ b/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
@@ -26,7 +26,7 @@ test cases:
     4. check if SoftAP config is correct
   sub module: NVS
   summary: use old NVS data WIFI function test
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: compatiable test
   test point 2: test if latest SDK work with pervious version of NVS data
   version: v1 (2017-06-01)

From 2edb9c4761fd5769c6242c79e3a53584e0f02213 Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Mon, 26 Aug 2019 14:00:44 +0800
Subject: [PATCH 2/2] test: fix integration test jobs not executed:

naming rule for parallel test job config file is different.
rename test job config file to make it unified.
---
 .gitlab-ci.yml                                                  | 2 +-
 .../{nvs_compatible_test.yml => nvs_compatible_test_.yml}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename components/idf_test/integration_test/CIConfigs/{nvs_compatible_test.yml => nvs_compatible_test_.yml} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6839218f74..b46da3cc56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -766,7 +766,7 @@ assign_test:
     LOG_PATH: "$CI_PROJECT_DIR/$CI_COMMIT_SHA"
     TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test/integration_test"
     MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/ModuleDefinition.yml"
-    CONFIG_FILE: "$CI_PROJECT_DIR/components/idf_test/integration_test/CIConfigs/$CI_JOB_NAME.yml"
+    CONFIG_FILE: "$CI_PROJECT_DIR/components/idf_test/integration_test/CIConfigs/${CI_JOB_NAME}_.yml"
   before_script: *add_gitlab_key_before
   script:
     # first test if config file exists, if not exist, exit 0
diff --git a/components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml b/components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml
similarity index 100%
rename from components/idf_test/integration_test/CIConfigs/nvs_compatible_test.yml
rename to components/idf_test/integration_test/CIConfigs/nvs_compatible_test_.yml