TSG-9690: 适配Rocky Linux8.5

✨ feat(printf): 使用fprintf输出屏显至stderr，替换printf
Update .gitlab-ci.yml testing源仅debug版开启asan
2022-03-01 13:35:24 +08:00 · 2021-06-08 15:34:03 +08:00 · 2020-10-30 23:05:32 +08:00 · 2020-10-15 09:47:55 +08:00 · 2020-10-14 15:02:23 +08:00 · 2020-10-09 10:30:54 +08:00
4 changed files with 193 additions and 92 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,145 +1,240 @@
-image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
 variables:
  GIT_STRATEGY: "clone"
+  BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
  BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
-  INSTALL_PREFIX: "/opt/MESA/lib/"
+  INSTALL_DEPENDENCY_LIBRARY:  libasan

 stages:
 - build

-.build_by_travis:
+.build_before_script:
  before_script:
  - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
  - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
  - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
  - chmod +x ./ci/travis.sh
+  - yum makecache
+  - yum install -y elfutils-libelf-devel
+
+
+.build_by_travis_for_centos7:
+  stage: build
+  image: $BUILD_IMAGE_CENTOS7
+  extends: .build_before_script
  script:
-  - wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo
-  - yum makecache fast
-  - ./ci/travis.sh
-  - cd build
+    - yum install -y libmnl-devel
+    - yum install -y libnfnetlink-devel
+    - ./ci/travis.sh
+    - cd build
  tags:
  - share

-branch_build_debug:
+.build_by_travis_for_centos8:
  stage: build
-  extends: .build_by_travis
+  image: $BUILD_IMAGE_CENTOS8
+  extends: .build_before_script
+  script:
+    - dnf --enablerepo=powertools install -y libmnl-devel
+    - dnf --enablerepo=powertools install -y libnfnetlink-devel
+    - ./ci/travis.sh
+  tags:
+    - share
+
+branch_build_debug_for_centos7:
+  stage: build
+  extends: .build_by_travis_for_centos7
  variables:
    BUILD_TYPE: Debug
  except:
+    - /^develop.*$/i
+    - /^master.*$/i
    - /^dev*.*$/i
    - /^rel*.*$/i
-    - /^master.*$/i
    - tags

-branch_build_release:
+branch_build_release_for_centos7:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
  except:
+    - /^develop.*$/i
+    - /^master.*$/i
    - /^dev*.*$/i
    - /^rel*.*$/i
-    - /^master.*$/i
    - tags

-develop_build_debug:
+develop_build_debug_for_centos7:
  stage: build
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
  variables:
    BUILD_TYPE: Debug
    PACKAGE: 1
+    UPLOAD_RPM: 1
+    ASAN_OPTION: ADDRESS
+    TESTING_VERSION_BUILD: 1
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
  artifacts:
    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
    paths:
      - build/*.rpm
  only:
+    - /^develop.*$/i
+    - /^master.*$/i
    - /^dev*.*$/i
    - /^rel*.*$/i
-    - /^master.*$/i

-develop_build_release:
+develop_build_release_for_centos7:
  stage: build
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
  variables:
    BUILD_TYPE: RelWithDebInfo
    PACKAGE: 1
+    UPLOAD_RPM: 1
+    TESTING_VERSION_BUILD: 1
+    PULP3_REPO_NAME: framework-testing-x86_64.el7
+    PULP3_DIST_NAME: framework-testing-x86_64.el7
  artifacts:
    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
    paths:
      - build/*.rpm
  only:
+    - /^develop.*$/i
+    - /^master.*$/i
    - /^dev*.*$/i
    - /^rel*.*$/i
-    - /^master.*$/i

+release_build_debug_for_centos7:
+  stage: build
+  variables:
+    BUILD_TYPE: Debug
+    PACKAGE: 1
+    UPLOAD_RPM: 1
+    PULP3_REPO_NAME: framework-stable-x86_64.el7
+    PULP3_DIST_NAME: framework-stable-x86_64.el7
+  extends: .build_by_travis_for_centos7
+  artifacts:
+    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
+    paths:
+      - build/*.rpm
+  only:
+    - tags

-release_build_release:
+release_build_release_for_centos7:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
    PACKAGE: 1
-    UPLOAD: 1
+    UPLOAD_RPM: 1
+    UPLOAD_SYMBOL_FILES: 1
+    SYMBOL_TARGET: libMESA_handle_logger
    PULP3_REPO_NAME: framework-stable-x86_64.el7
    PULP3_DIST_NAME: framework-stable-x86_64.el7
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
  artifacts:
    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
    paths:
      - build/*.rpm
  only:
    - tags
-  except:
-    - /^v[0-9].*-testing$/i    

-release_build_release_devel:
+branch_build_debug_for_centos8:
+  stage: build
+  extends: .build_by_travis_for_centos8
+  variables:
+    BUILD_TYPE: Debug
+  except:
+    - /^develop.*$/i
+    - /^master.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
+    - tags
+
+branch_build_release_for_centos8:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
-    ENABLE_DEVEL_SWITCH: "ON"
+  extends: .build_by_travis_for_centos8
+  except:
+    - /^develop.*$/i
+    - /^master.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
+    - tags
+
+develop_build_debug_for_centos8:
+  stage: build
+  extends: .build_by_travis_for_centos8
+  variables:
+    BUILD_TYPE: Debug
    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-stable-x86_64.el7
-    PULP3_DIST_NAME: framework-stable-x86_64.el7
-  extends: .build_by_travis
+    UPLOAD_RPM: 1
+    ASAN_OPTION: ADDRESS
+    TESTING_VERSION_BUILD: 1
+    PULP3_REPO_NAME: framework-testing-x86_64.el8
+    PULP3_DIST_NAME: framework-testing-x86_64.el8
+  artifacts:
+    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
+    paths:
+      - build/*.rpm
+  only:
+    - /^develop.*$/i
+    - /^master.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
+
+develop_build_release_for_centos8:
+  stage: build
+  extends: .build_by_travis_for_centos8
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+    UPLOAD_RPM: 1
+    TESTING_VERSION_BUILD: 1
+    PULP3_REPO_NAME: framework-testing-x86_64.el8
+    PULP3_DIST_NAME: framework-testing-x86_64.el8
+  artifacts:
+    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  only:
+    - /^develop.*$/i
+    - /^master.*$/i
+    - /^dev*.*$/i
+    - /^rel*.*$/i
+
+release_build_debug_for_centos8:
+  stage: build
+  variables:
+    BUILD_TYPE: Debug
+    PACKAGE: 1
+    UPLOAD_RPM: 1
+    PULP3_REPO_NAME: framework-stable-x86_64.el8
+    PULP3_DIST_NAME: framework-stable-x86_64.el8
+  extends: .build_by_travis_for_centos8
+  artifacts:
+    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-debug"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
+
+release_build_release_for_centos8:
+  stage: build
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+    UPLOAD_RPM: 1
+    UPLOAD_SYMBOL_FILES: 1
+    SYMBOL_TARGET: libMESA_handle_logger
+    PULP3_REPO_NAME: framework-stable-x86_64.el8
+    PULP3_DIST_NAME: framework-stable-x86_64.el8
+  extends: .build_by_travis_for_centos8
  artifacts:
    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
    paths:
      - build/*.rpm
  only:
    - tags
-  except:
-    - /^v[0-9].*-testing$/i    
-
-testing_build_release:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i   
-
-testing_build_release_devel:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    ENABLE_DEVEL_SWITCH: "ON"
-    PACKAGE: 1
-    UPLOAD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  extends: .build_by_travis
-  artifacts:
-    name: "MESA_handle_logger-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^v[0-9].*-testing$/i  
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -33,7 +33,14 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"

 # Install dependency from YUM
-#yum install -y mrzcpd framework numactl-devel zlib-devel librdkafka-devel systemd-devel
+if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
+      yum install -y $INSTALL_DEPENDENCY_LIBRARY
+fi
+
+if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then
+	source /opt/rh/devtoolset-7/enable
+fi
+
 mkdir build || true
 cd build

@@ -41,6 +48,8 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
      -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
      -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
      -DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \
+      -DASAN_OPTION=$ASAN_OPTION \
+      -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \
      ..

 make
@@ -49,13 +58,14 @@ if [ -n "${PACKAGE}" ]; then
 	make package
 fi

-if [ -n "${UPLOAD}" ]; then	
+if [ -n "${UPLOAD_RPM}" ]; then	
 	cp ~/rpm_upload_tools.py ./
 	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi

-#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
-#  rpm -i tfe*debuginfo*.rpm
-#  cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#  sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#fi
+if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
+	rpm -i $SYMBOL_TARGET*debuginfo*.rpm
+	_symbol_file=`find /usr/lib/debug/ -name "$SYMBOL_TARGET*.so*.debug"`
+	cp $_symbol_file ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+	sentry-cli upload-dif -t elf ${_symbol_file}info.${CI_COMMIT_SHORT_SHA}
+fi
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -12,36 +12,32 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
-execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)

 execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
 SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)

 # RPM Build
 set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
+set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_VENDOR "MESA")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes")
-set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
+set(CPACK_RPM_PACKAGE_RELEASE_DIST "on")
 set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
-set(CPACK_RPM_PACKAGE_DEBUG 1)

 set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
 set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
+
 set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES")
+set(CPACK_COMPONENT_EXECUTABLE_GROUP "LIBRARIES")
+set(CPACK_COMPONENT_PROFILE_GROUP "LIBRARIES")
+
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
-set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
-
-set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries")
-set(CPACK_COMPONENT_EXECUTABLE_GROUP "libraries")
-set(CPACK_COMPONENT_PROFILE_GROUP "libraries")
-
-set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_COMPONENT_HEADER_GROUP "header")

 set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
--- a/src/MESA_handle_logger.c
+++ b/src/MESA_handle_logger.c
@@ -156,7 +156,7 @@ static void snapshot_handle_info(const char *handle_name, const char *log_path,

    if(g_zlog_inited == 0)
    {
-        printf("[snapshot_handle_info], Nobody call MESA_handle_runtime_log_creation before, Using (%s) to init zlog, handle_name(%s), log_path(%s), log_level(%d)!!!\n", tmp_conf_filepath, handle_name, log_path, level);
+        fprintf(stderr,"[snapshot_handle_info], Nobody call MESA_handle_runtime_log_creation before, Using (%s) to init zlog, handle_name(%s), log_path(%s), log_level(%d)!!!\n", tmp_conf_filepath, handle_name, log_path, level);
        zlog_init(tmp_conf_filepath);
        zlog_reload(NULL);
    }
@@ -193,7 +193,7 @@ void *MESA_create_runtime_log_handle(const char *file_path, int level)
    zc = zlog_get_category(p_name);
    if (!zc)
    {
-        printf("[MESA_create_runtime_log_handle], get zlog category (%s) in global_conf_filepath(%s) fail\n", p_name, global_conf_filepath);
+        fprintf(stderr,"[MESA_create_runtime_log_handle], get zlog category (%s) in global_conf_filepath(%s) fail\n", p_name, global_conf_filepath);
    }
    p_handle = (log_handle_t *)calloc(sizeof(log_handle_t), 1);
    strncpy(p_handle->runtime_log_file, file_path, sizeof(p_handle->runtime_log_file) - 1);
@@ -237,11 +237,11 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
    int rc = 0;
    if (conf_path == NULL || (access(conf_path, R_OK) != 0))
    {
-        printf("[MESA_handle_runtime_log_creation],  PATH (%s) unable to access, will output log to STDOUT or Using ZLOG_CONF_PATH (%s) !\n", conf_path, env);
+        fprintf(stderr,"[MESA_handle_runtime_log_creation],  PATH (%s) unable to access, will output log to STDOUT or Using ZLOG_CONF_PATH (%s) !\n", conf_path, env);
        rc = zlog_init(NULL);
        if (rc)
        {
-            printf("[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
+            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed !!! \n", env);
            return -1;
        }
        else
@@ -257,11 +257,11 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
        rc = zlog_init(conf_path);
        if (rc)
        {
-            printf("[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
+            fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (%s) failed , using [NULL] retry !\n", conf_path);
            rc = zlog_init(NULL);
            if (rc)
            {
-                printf("[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
+                fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog by (NULL) or (%s) failed \n", env);
                return -1;
            }
            else
@@ -279,7 +279,7 @@ int MESA_handle_runtime_log_creation(const char *conf_path)
        }
        
    }
-    printf("[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
+    fprintf(stderr,"[MESA_handle_runtime_log_creation], INIT zlog finish, Using (%s). \n", global_conf_filepath);
    g_zlog_inited = 1;
    zlog_profile();
Author	SHA1	Message	Date
liuxueli	b677bb6c71	TSG-9690: 适配Rocky Linux8.5	2022-03-01 13:35:24 +08:00
yangwei	f76af2f036	✨ feat(printf): 使用fprintf输出屏显至stderr，替换printf	2021-06-08 15:34:03 +08:00
杨威	31bd3fed9c	Update .gitlab-ci.yml testing源仅debug版开启asan	2020-10-30 23:05:32 +08:00
杨威	9ecf746f0f	Update .gitlab-ci.yml	2020-10-15 09:47:55 +08:00
杨威	040ce55a1b	Update travis.sh, ASAN using devtoolset-7	2020-10-14 15:02:23 +08:00
liuxueli	cb4ad71c50	编译增加ASAN的选项	2020-10-09 10:30:54 +08:00
liuxueli	02100e4232	上传debuginfo至sentry	2020-10-09 10:23:26 +08:00