diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f91385..efc174b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,119 +3,11 @@ variables: BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/opt/tsg/sce" TESTING_VERSION_BUILD: 0 - BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master" BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" stages: - build -############################################################################### -# compile use image: build-env:master -############################################################################### - -.build_by_travis_for_centos7: - image: $BUILD_IMAGE_CENTOS7 - 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 - script: - - yum makecache - - ./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 - - /^release-.*$/i - - tags - -branch_build_release_for_centos7: - stage: build - variables: - BUILD_TYPE: RelWithDebInfo - extends: .build_by_travis_for_centos7 - except: - - /^develop-.*$/i - - /^release-.*$/i - - tags - -develop_build_debug_for_centos7: - stage: build - extends: .build_by_travis_for_centos7 - variables: - TESTING_VERSION_BUILD: 1 - #UPLOAD_SYMBOL_FILES: 1 - BUILD_TYPE: Debug - #ASAN_OPTION: ADDRESS - PACKAGE: 1 - PULP3_REPO_NAME: tsg-testing-x86_64.el7 - PULP3_DIST_NAME: tsg-testing-x86_64.el7 - artifacts: - name: "sce-develop-$CI_COMMIT_REF_NAME-debug" - paths: - - build/*.rpm - only: - - /^develop-.*$/i - - /^release-.*$/i - -develop_build_release_for_centos7: - stage: build - extends: .build_by_travis_for_centos7 - variables: - TESTING_VERSION_BUILD: 1 - #UPLOAD_SYMBOL_FILES: 1 - #ASAN_OPTION: ADDRESS - BUILD_TYPE: RelWithDebInfo - PACKAGE: 1 - PULP3_REPO_NAME: tsg-testing-x86_64.el7 - PULP3_DIST_NAME: tsg-testing-x86_64.el7 - artifacts: - name: "sce-develop-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - only: - - /^develop-.*$/i - - /^release-.*$/i - -release_build_debug_for_centos7: - stage: build - variables: - #UPLOAD_SYMBOL_FILES: 1 - BUILD_TYPE: Debug - PACKAGE: 1 - PULP3_REPO_NAME: tsg-stable-x86_64.el7 - PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis_for_centos7 - artifacts: - name: "sce-install-$CI_COMMIT_REF_NAME-debug" - paths: - - build/*.rpm - only: - - tags - -release_build_release_for_centos7: - stage: build - variables: - BUILD_TYPE: RelWithDebInfo - #UPLOAD_SYMBOL_FILES: 1 - PACKAGE: 1 - PULP3_REPO_NAME: tsg-stable-x86_64.el7 - PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis_for_centos7 - artifacts: - name: "sce-install-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - only: - - tags - ############################################################################### # compile use image: build-env:rockylinux ############################################################################### diff --git a/ci/travis.sh b/ci/travis.sh index 9b98f3f..4a7b6bd 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -39,9 +39,11 @@ yum install -y libmaatframe-devel yum install -y libMESA_handle_logger-devel yum install -y libMESA_prof_load-devel yum install -y libMESA_field_stat2-devel +yum install -y libfieldstat4-devel yum install -y numactl-libs # required by mrzcpd yum install -y libibverbs # required by mrzcpd yum install -y libbreakpad_mini-devel +yum install -y librdkafka-1.2.2.1218b3c yum install -y librdkafka-devel-1.2.2.1218b3c if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ]; then diff --git a/common/src/kafka.cpp b/common/src/kafka.cpp index c934015..4fb0e68 100644 --- a/common/src/kafka.cpp +++ b/common/src/kafka.cpp @@ -5,7 +5,7 @@ #include "utils.h" #include "kafka.h" #include -#include +#include #define MAX_SYMBOL_LEN 128 diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 77edd1e..687e852 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -42,7 +42,7 @@ set(MESA_FRAMEWORK_INCLUDE_DIR /opt/MESA/include) add_library(rdkafka SHARED IMPORTED GLOBAL) set_property(TARGET rdkafka PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/librdkafka.so) -set_property(TARGET rdkafka PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}/MESA/) +set_property(TARGET rdkafka PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) add_library(MESA_handle_logger SHARED IMPORTED GLOBAL) set_property(TARGET MESA_handle_logger PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libMESA_handle_logger.so) @@ -58,7 +58,7 @@ set_property(TARGET MESA_field_stat PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MES add_library(fieldstat4 SHARED IMPORTED GLOBAL) set_property(TARGET fieldstat4 PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libfieldstat4.so) -set_property(TARGET fieldstat4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}/fieldstat/) +set_property(TARGET fieldstat4 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MESA_FRAMEWORK_INCLUDE_DIR}) add_library(maatframe SHARED IMPORTED GLOBAL) set_property(TARGET maatframe PROPERTY IMPORTED_LOCATION ${MESA_FRAMEWORK_LIB_DIR}/libmaatframe.so)