From 9f8f929e257e3cba65863e6666a7afbd5e4f3005 Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Wed, 21 Jul 2021 10:02:52 +0800
Subject: [PATCH] CI: rename log path of IT jobs

---
 .gitlab/ci/deploy.yml      | 3 +--
 .gitlab/ci/target-test.yml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index f8f6f20fcb..fb3a3d37c0 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -31,7 +31,6 @@ deploy_test_result:
       - ${CI_PROJECT_DIR}/test-management/*.log
       # save all test logs as artifacts, make it easier to track errors
       - ${CI_PROJECT_DIR}/TEST_LOGS
-      - $CI_PROJECT_DIR/$CI_COMMIT_SHA
     expire_in: 1 mos
   variables:
     UNIT_TEST_CASE_FILE: "${CI_PROJECT_DIR}/components/idf_test/unit_test/TestCaseAll.yml"
@@ -51,7 +50,7 @@ deploy_test_result:
     - cd test-management
     - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE}
     # update test results
-    - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l CI -p ${CI_PROJECT_DIR}/TEST_LOGS ${CI_PROJECT_DIR}/${CI_COMMIT_SHA} --pipeline_url ${CI_PIPELINE_URL}
+    - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l CI -p ${CI_PROJECT_DIR}/TEST_LOGS --pipeline_url ${CI_PIPELINE_URL}
 
 check_submodule_sync:
   extends:
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 9bf1d88a50..83f0c07651 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -701,7 +701,7 @@ UT_S3:
     - build_ssc_esp32
   variables:
     LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32_IDF"
-    LOG_PATH: "${CI_PROJECT_DIR}/${CI_COMMIT_SHA}"
+    LOG_PATH: "${CI_PROJECT_DIR}/TEST_LOGS"
     TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/auto_test_script/TestCaseFiles"
     MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/ModuleDefinition.yml"
     CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/components/idf_test/integration_test/CIConfigs"