更新CI配置

* 禁用UPLOAD_SYMBOL_FILES
    * ASAN_OPTION兼容CentOS7/RockLinux8.5
This commit is contained in:
luwenpeng
2023-05-06 14:56:29 +08:00
parent bd899c08f1
commit 0aa8f70df7
2 changed files with 10 additions and 10 deletions

View File

@@ -51,7 +51,7 @@ develop_build_debug_for_centos7:
extends: .build_by_travis_for_centos7 extends: .build_by_travis_for_centos7
variables: variables:
TESTING_VERSION_BUILD: 1 TESTING_VERSION_BUILD: 1
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
BUILD_TYPE: Debug BUILD_TYPE: Debug
ASAN_OPTION: ADDRESS ASAN_OPTION: ADDRESS
PACKAGE: 1 PACKAGE: 1
@@ -70,7 +70,7 @@ develop_build_release_for_centos7:
extends: .build_by_travis_for_centos7 extends: .build_by_travis_for_centos7
variables: variables:
TESTING_VERSION_BUILD: 1 TESTING_VERSION_BUILD: 1
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
ASAN_OPTION: ADDRESS ASAN_OPTION: ADDRESS
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
PACKAGE: 1 PACKAGE: 1
@@ -87,7 +87,7 @@ develop_build_release_for_centos7:
release_build_debug_for_centos7: release_build_debug_for_centos7:
stage: build stage: build
variables: variables:
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
BUILD_TYPE: Debug BUILD_TYPE: Debug
PACKAGE: 1 PACKAGE: 1
PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_REPO_NAME: tsg-stable-x86_64.el7
@@ -104,7 +104,7 @@ release_build_release_for_centos7:
stage: build stage: build
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
PACKAGE: 1 PACKAGE: 1
PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_REPO_NAME: tsg-stable-x86_64.el7
PULP3_DIST_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 extends: .build_by_travis_for_centos8
variables: variables:
TESTING_VERSION_BUILD: 1 TESTING_VERSION_BUILD: 1
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
BUILD_TYPE: Debug BUILD_TYPE: Debug
ASAN_OPTION: ADDRESS ASAN_OPTION: ADDRESS
PACKAGE: 1 PACKAGE: 1
@@ -177,7 +177,7 @@ develop_build_release_for_centos8:
extends: .build_by_travis_for_centos8 extends: .build_by_travis_for_centos8
variables: variables:
TESTING_VERSION_BUILD: 1 TESTING_VERSION_BUILD: 1
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
ASAN_OPTION: ADDRESS ASAN_OPTION: ADDRESS
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
PACKAGE: 1 PACKAGE: 1
@@ -194,7 +194,7 @@ develop_build_release_for_centos8:
release_build_debug_for_centos8: release_build_debug_for_centos8:
stage: build stage: build
variables: variables:
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
BUILD_TYPE: Debug BUILD_TYPE: Debug
PACKAGE: 1 PACKAGE: 1
PULP3_REPO_NAME: tsg-stable-x86_64.el8 PULP3_REPO_NAME: tsg-stable-x86_64.el8
@@ -211,7 +211,7 @@ release_build_release_for_centos8:
stage: build stage: build
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
UPLOAD_SYMBOL_FILES: 1 #UPLOAD_SYMBOL_FILES: 1
PACKAGE: 1 PACKAGE: 1
PULP3_REPO_NAME: tsg-stable-x86_64.el8 PULP3_REPO_NAME: tsg-stable-x86_64.el8
PULP3_DIST_NAME: tsg-stable-x86_64.el8 PULP3_DIST_NAME: tsg-stable-x86_64.el8

View File

@@ -40,10 +40,10 @@ yum install -y libMESA_handle_logger-devel
yum install -y libMESA_prof_load-devel yum install -y libMESA_prof_load-devel
yum install -y libMESA_field_stat2-devel yum install -y libMESA_field_stat2-devel
yum install -y numactl-libs # required by mrzcpd 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 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 source /opt/rh/devtoolset-7/enable
fi fi