From 0aa8f70df7a74743b86658bb4623b3d4d900b8b4 Mon Sep 17 00:00:00 2001
From: luwenpeng <luwenpeng@geedgenetworks.com>
Date: Sat, 6 May 2023 14:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0CI=E9=85=8D=E7=BD=AE=20=20=20?=
 =?UTF-8?q?=20=20*=20=E7=A6=81=E7=94=A8UPLOAD=5FSYMBOL=5FFILES=20=20=20=20?=
 =?UTF-8?q?=20*=20ASAN=5FOPTION=E5=85=BC=E5=AE=B9CentOS7/RockLinux8.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 16 ++++++++--------
 ci/travis.sh   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a93bb1a..a05c946 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ develop_build_debug_for_centos7:
   extends: .build_by_travis_for_centos7
   variables:
     TESTING_VERSION_BUILD: 1
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     BUILD_TYPE: Debug
     ASAN_OPTION: ADDRESS
     PACKAGE: 1
@@ -70,7 +70,7 @@ develop_build_release_for_centos7:
   extends: .build_by_travis_for_centos7
   variables:
     TESTING_VERSION_BUILD: 1
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     ASAN_OPTION: ADDRESS
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
@@ -87,7 +87,7 @@ develop_build_release_for_centos7:
 release_build_debug_for_centos7:
   stage: build
   variables:
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     BUILD_TYPE: Debug
     PACKAGE: 1
     PULP3_REPO_NAME: tsg-stable-x86_64.el7
@@ -104,7 +104,7 @@ release_build_release_for_centos7:
   stage: build
   variables:
     BUILD_TYPE: RelWithDebInfo
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     PACKAGE: 1
     PULP3_REPO_NAME: tsg-stable-x86_64.el7
     PULP3_DIST_NAME: tsg-stable-x86_64.el7
@@ -158,7 +158,7 @@ develop_build_debug_for_centos8:
   extends: .build_by_travis_for_centos8
   variables:
     TESTING_VERSION_BUILD: 1
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     BUILD_TYPE: Debug
     ASAN_OPTION: ADDRESS
     PACKAGE: 1
@@ -177,7 +177,7 @@ develop_build_release_for_centos8:
   extends: .build_by_travis_for_centos8
   variables:
     TESTING_VERSION_BUILD: 1
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     ASAN_OPTION: ADDRESS
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
@@ -194,7 +194,7 @@ develop_build_release_for_centos8:
 release_build_debug_for_centos8:
   stage: build
   variables:
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     BUILD_TYPE: Debug
     PACKAGE: 1
     PULP3_REPO_NAME: tsg-stable-x86_64.el8
@@ -211,7 +211,7 @@ release_build_release_for_centos8:
   stage: build
   variables:
     BUILD_TYPE: RelWithDebInfo
-    UPLOAD_SYMBOL_FILES: 1
+    #UPLOAD_SYMBOL_FILES: 1
     PACKAGE: 1
     PULP3_REPO_NAME: tsg-stable-x86_64.el8
     PULP3_DIST_NAME: tsg-stable-x86_64.el8
diff --git a/ci/travis.sh b/ci/travis.sh
index 3b5351a..11b137f 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -40,10 +40,10 @@ yum install -y libMESA_handle_logger-devel
 yum install -y libMESA_prof_load-devel
 yum install -y libMESA_field_stat2-devel
 yum install -y numactl-libs # required by mrzcpd
-yum install -y libibverbs # required by mrzcpd
+yum install -y libibverbs   # required by mrzcpd
 yum install -y libbreakpad_mini-devel
 
-if [ $ASAN_OPTION ]; then
+if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ]; then
   source /opt/rh/devtoolset-7/enable
 fi