TSG-9938 sapp适配rocky linux8.5

.gitlab-ci.yml

@@ -1,14 +1,15 @@
-image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
 variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
+  BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
   INSTALL_PREFIX: "/home/mesasoft/"
   SYMBOL_TARGET: benchmark_pcap
 
 stages:
 - build
 
-.build_by_travis:
+.build_by_travis_for_centos7:
   before_script:
   - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
   - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
@@ -21,10 +22,23 @@ stages:
   tags:
   - share
 
+.build_by_travis_for_centos8:
+  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
+  - cd build  
+  tags:
+  - share
 
-develop_build_release:
+develop_build_release_for_centos7:
   stage: build
-  extends: .build_by_travis
+  image: $BUILD_IMAGE_CENTOS7
+  extends: .build_by_travis_for_centos7
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
@@ -42,16 +56,57 @@ develop_build_release:
     - /^rel*.*$/i
     - /^master.*$/i
 
-
-release_build_release:
+release_build_release_for_centos7:
   stage: build
+  image: $BUILD_IMAGE_CENTOS7
   variables:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
     UPLOAD: 1
     PULP3_REPO_NAME: platform-stable-x86_64.el7
     PULP3_DIST_NAME: platform-stable-x86_64.el7
-  extends: .build_by_travis
+  extends: .build_by_travis_for_centos7
+  artifacts:
+    name: "benchmark_pcap-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  tags:
+  - share
+  only:
+    - tags   
+
+develop_build_release_for_centos8:
+  stage: build
+  image: $BUILD_IMAGE_CENTOS8
+  extends: .build_by_travis_for_centos8
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+    UPLOAD: 1
+    PULP3_REPO_NAME: platform-testing-x86_64.el8
+    PULP3_DIST_NAME: platform-testing-x86_64.el8
+  artifacts:
+    name: "benchmark_pcap-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  tags:
+  - share
+  only:
+    - /^dev*.*$/i
+    - /^rel*.*$/i
+    - /^master.*$/i
+
+
+release_build_release_for_centos8:
+  stage: build
+  image: $BUILD_IMAGE_CENTOS8
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+    UPLOAD: 1
+    PULP3_REPO_NAME: platform-stable-x86_64.el8
+    PULP3_DIST_NAME: platform-stable-x86_64.el8
+  extends: .build_by_travis_for_centos8
   artifacts:
     name: "benchmark_pcap-$CI_COMMIT_REF_NAME-release"
     paths:

CMakeLists.txt

@@ -75,6 +75,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/jump_layer DESTINATION ./
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/mpls DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/performance DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/plugctrl DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/proxy DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tcp DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tcp/dumpfile.list DESTINATION ./for_gtest_only/tcp COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/timer DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
@@ -82,6 +83,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/transparent DESTINATION .
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tunnel DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/udp DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/vlan DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/vxlan DESTINATION ./for_gtest_only COMPONENT EXECUTABLE)
 
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/asymmetric/ DESTINATION ./for_gtest_only/asymmetric COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/control/ DESTINATION ./for_gtest_only/control COMPONENT EXECUTABLE)
@@ -97,6 +99,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/jump_layer/ DESTINATION .
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/mpls/ DESTINATION ./for_gtest_only/mpls COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/performance/ DESTINATION ./for_gtest_only/performance COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/plugctrl/ DESTINATION ./for_gtest_only/plugctrl COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/proxy/ DESTINATION ./for_gtest_only/proxy COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tcp/ DESTINATION ./for_gtest_only/tcp COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tcp/dumpfile.list/ DESTINATION ./for_gtest_only/tcp/dumpfile.list COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/timer/ DESTINATION ./for_gtest_only/timer COMPONENT EXECUTABLE)
@@ -104,6 +107,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/transparent/ DESTINATION
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/tunnel/ DESTINATION ./for_gtest_only/tunnel COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/udp/ DESTINATION ./for_gtest_only/udp COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/vlan/ DESTINATION ./for_gtest_only/vlan COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/for_gtest_only/vxlan/ DESTINATION ./for_gtest_only/vlan COMPONENT EXECUTABLE)
 ########################
 
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/ftp DESTINATION . COMPONENT EXECUTABLE)
@@ -169,9 +173,15 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/mms/ DESTINATION ./mss COMPONENT EXECUTA
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/mpls DESTINATION . COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/mpls/ DESTINATION ./mpls COMPONENT EXECUTABLE)
 
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/nbns DESTINATION . COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/nbns/ DESTINATION ./nbns COMPONENT EXECUTABLE)
+
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/ntp DESTINATION . COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/ntp/ DESTINATION ./ntp COMPONENT EXECUTABLE)
 
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/oicq DESTINATION . COMPONENT EXECUTABLE)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/oicq/ DESTINATION ./oicq COMPONENT EXECUTABLE)
+
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/pppoe DESTINATION . COMPONENT EXECUTABLE)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/pppoe/ DESTINATION ./pppoe COMPONENT EXECUTABLE)
 

ci/travis.sh

@@ -40,7 +40,7 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
 	source /etc/profile.d/framework.sh
 fi
 
-if [ $ASAN_OPTION ];then
+if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then
 	source /opt/rh/devtoolset-7/enable
 fi
 

cmake/Package.cmake

@@ -9,15 +9,15 @@ 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)
 
 # 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)
@@ -26,12 +26,9 @@ set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
 
 set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE)
 set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
-set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-
 
 set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable")
 
-
 set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})