🐎 ci(add aarch64 jobs): aarch64 + el9

WIP
2024-11-11 14:27:49 +08:00 · 2024-11-11 14:09:51 +08:00 · 2024-11-11 14:09:11 +08:00 · 2024-11-11 13:52:06 +08:00
3 changed files with 101 additions and 192 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,97 +1,64 @@
 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_DEPENDENCY_LIBRARY: sapp-devel framework_env libpcap libpcap-devel
+  BUILD_IMAGE_X86_64_ROCKY8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
+  BUILD_IMAGE_AARCH64_ROCKY9: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64"
+  INSTALL_DEPENDENCY_LIBRARY: libpcap libpcap-devel
  INSTALL_PREFIX: "/opt/MESA/lib/"

 stages:
 - build
 - test

-google_test_for_centos7:
-  stage: test
-  image: $BUILD_IMAGE_CENTOS7
-  script:
-    - cp -r test/sample_pcap /tmp
-    - ulimit -c 0
-    - cp /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer /tmp/
-    - mkdir -p /opt/MESA/lib
-    - cp /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so /opt/MESA/lib/
-    - echo "/opt/MESA/lib" >> /etc/ld.so.conf
-    - ldconfig    
-    - cd /tmp 
-    - ./gtest_jump_layer
-  dependencies:
-    - branch_build_debug_for_centos7
-    - branch_build_release_for_centos7
-    - develop_build_debug_for_centos7
-    - develop_build_release_for_centos7
-    - release_build_debug_for_centos7
-    - release_build_release_for_centos7
-  tags:
-  - share    
-
-google_test_for_centos8:
-  stage: test
-  image: $BUILD_IMAGE_CENTOS8
-  script:
-    - cp -r test/sample_pcap /tmp
-    - ulimit -c 0
-    - cp /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer /tmp/
-    - mkdir -p /opt/MESA/lib
-    - cp /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so /opt/MESA/lib/
-    - echo "/opt/MESA/lib" >> /etc/ld.so.conf
-    - ldconfig    
-    - cd /tmp 
-    - ./gtest_jump_layer
-  dependencies:
-    - branch_build_debug_for_centos8
-    - branch_build_release_for_centos8
-    - develop_build_debug_for_centos8
-    - develop_build_release_for_centos8
-    - release_build_debug_for_centos8
-    - release_build_release_for_centos8
-  tags:
-  - share   
-
 .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
-    - sed -i 's/\/8\//\/7\//g' /etc/yum.repos.d/repo.internal.geedge.net.repo  
-    - yum makecache
    - chmod +x ./ci/travis.sh
-    - yum install -y elfutils-libelf-devel

-.build_by_travis_for_centos7:
+###############################################################################
+# test on x86_64 Rocky8
+###############################################################################
+
+google_test_for_x86_64_rocky8:
+  stage: test
+  image: $BUILD_IMAGE_X86_64_ROCKY8
+  script:
+    - cp -r test/sample_pcap /tmp
+    - ulimit -c 0
+    - cp /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer /tmp/
+    - mkdir -p /opt/MESA/lib
+    - cp /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so /opt/MESA/lib/
+    - echo "/opt/MESA/lib" >> /etc/ld.so.conf
+    - ldconfig    
+    - cd /tmp 
+    - ./gtest_jump_layer
+  dependencies:
+    - branch_build_debug_for_x86_64_rocky8
+    - branch_build_release_for_x86_64_rocky8
+    - release_build_debug_for_x86_64_rocky8
+    - release_build_release_for_x86_64_rocky8
+  tags:
+  - tsg-os-builder-el8   
+
+###############################################################################
+# build on x86_64 Rocky8
+###############################################################################
+
+.build_by_travis_for_x86_64_rocky8:
  stage: build
-  image: $BUILD_IMAGE_CENTOS7
+  image: $BUILD_IMAGE_X86_64_ROCKY8
  extends: .build_before_script
  script:
-    - yum install -y libmnl-devel
-    - yum install -y libnfnetlink-devel
    - ./ci/travis.sh
  tags:
-    - share
+    - tsg-os-builder-el8

-.build_by_travis_for_centos8:
+
+branch_build_debug_for_x86_64_rocky8:
  stage: build
-  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
+  extends: .build_by_travis_for_x86_64_rocky8
  variables:
    BUILD_TYPE: Debug
  artifacts:
@@ -103,11 +70,11 @@ branch_build_debug_for_centos7:
    - /^master.*$/i
    - tags

-branch_build_release_for_centos7:
+branch_build_release_for_x86_64_rocky8:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
-  extends: .build_by_travis_for_centos7
+  extends: .build_by_travis_for_x86_64_rocky8
  artifacts:
    paths:
    - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
@@ -117,57 +84,15 @@ branch_build_release_for_centos7:
    - /^master.*$/i
    - tags

-develop_build_debug_for_centos7:
-  stage: build
-  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: libMESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
-    paths:
-      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
-      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so      
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-develop_build_release_for_centos7:
-  stage: build
-  extends: .build_by_travis_for_centos7
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: "OFF"
-    TESTING_VERSION_BUILD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el7
-    PULP3_DIST_NAME: framework-testing-x86_64.el7
-  artifacts:
-    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
-      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-release_build_debug_for_centos7:
+release_build_debug_for_x86_64_rocky8:
  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
+    PULP3_REPO_NAME: framework-stable-x86_64.el8
+    PULP3_DIST_NAME: framework-stable-x86_64.el8
+  extends: .build_by_travis_for_x86_64_rocky8
  artifacts:
    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
    paths:
@@ -177,17 +102,16 @@ release_build_debug_for_centos7:
  only:
    - tags

-release_build_release_for_centos7:
+release_build_release_for_x86_64_rocky8:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
    PACKAGE: 1
    UPLOAD_RPM: 1
-    UPLOAD_SYMBOL_FILES: 1
    SYMBOL_TARGET: libMESA_jump_layer
-    PULP3_REPO_NAME: framework-stable-x86_64.el7
-    PULP3_DIST_NAME: framework-stable-x86_64.el7
-  extends: .build_by_travis_for_centos7
+    PULP3_REPO_NAME: framework-stable-x86_64.el8
+    PULP3_DIST_NAME: framework-stable-x86_64.el8
+  extends: .build_by_travis_for_x86_64_rocky8
  artifacts:
    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
    paths:
@@ -197,9 +121,48 @@ release_build_release_for_centos7:
  only:
    - tags

-branch_build_debug_for_centos8:
+###############################################################################
+# test on aarch64 Rocky9
+###############################################################################
+
+google_test_for_aarch64_rocky9:
+  stage: test
+  image: $BUILD_IMAGE_AARCH64_ROCKY9
+  script:
+    - cp -r test/sample_pcap /tmp
+    - ulimit -c 0
+    - cp /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer /tmp/
+    - mkdir -p /opt/MESA/lib
+    - cp /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so /opt/MESA/lib/
+    - echo "/opt/MESA/lib" >> /etc/ld.so.conf
+    - ldconfig    
+    - cd /tmp 
+    - ./gtest_jump_layer
+  dependencies:
+    - branch_build_debug_for_aarch64_rocky9
+    - branch_build_release_for_aarch64_rocky9
+    - release_build_debug_for_aarch64_rocky9
+    - release_build_release_for_aarch64_rocky9
+  tags:
+  - tsg-os-builder-aarch64   
+
+###############################################################################
+# build on aarch64 Rocky9
+###############################################################################
+
+.build_by_travis_for_aarch64_rocky9:
  stage: build
-  extends: .build_by_travis_for_centos8
+  image: $BUILD_IMAGE_AARCH64_ROCKY9
+  extends: .build_before_script
+  script:
+    - ./ci/travis.sh
+  tags:
+    - tsg-os-builder-aarch64
+
+
+branch_build_debug_for_aarch64_rocky9:
+  stage: build
+  extends: .build_by_travis_for_aarch64_rocky9
  variables:
    BUILD_TYPE: Debug
  artifacts:
@@ -211,11 +174,11 @@ branch_build_debug_for_centos8:
    - /^master.*$/i
    - tags

-branch_build_release_for_centos8:
+branch_build_release_for_aarch64_rocky9:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
-  extends: .build_by_travis_for_centos8
+  extends: .build_by_travis_for_aarch64_rocky9
  artifacts:
    paths:
    - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
@@ -225,57 +188,15 @@ branch_build_release_for_centos8:
    - /^master.*$/i
    - tags

-develop_build_debug_for_centos8:
-  stage: build
-  extends: .build_by_travis_for_centos8
-  variables:
-    BUILD_TYPE: Debug
-    PACKAGE: 1
-    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: libMESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
-    paths:
-      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
-      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so      
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-develop_build_release_for_centos8:
-  stage: build
-  extends: .build_by_travis_for_centos8
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: "OFF"
-    TESTING_VERSION_BUILD: 1
-    PULP3_REPO_NAME: framework-testing-x86_64.el8
-    PULP3_DIST_NAME: framework-testing-x86_64.el8
-  artifacts:
-    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
-      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-release_build_debug_for_centos8:
+release_build_debug_for_aarch64_rocky9:
  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
+    PULP3_REPO_NAME: framework-stable-aarch64.el9
+    PULP3_DIST_NAME: framework-stable-aarch64.el9
+  extends: .build_by_travis_for_aarch64_rocky9
  artifacts:
    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
    paths:
@@ -285,17 +206,16 @@ release_build_debug_for_centos8:
  only:
    - tags

-release_build_release_for_centos8:
+release_build_release_for_aarch64_rocky9:
  stage: build
  variables:
    BUILD_TYPE: RelWithDebInfo
    PACKAGE: 1
    UPLOAD_RPM: 1
-    UPLOAD_SYMBOL_FILES: 1
    SYMBOL_TARGET: libMESA_jump_layer
-    PULP3_REPO_NAME: framework-stable-x86_64.el8
-    PULP3_DIST_NAME: framework-stable-x86_64.el8
-  extends: .build_by_travis_for_centos8
+    PULP3_REPO_NAME: framework-stable-aarch64.el9
+    PULP3_DIST_NAME: framework-stable-aarch64.el9
+  extends: .build_by_travis_for_aarch64_rocky9
  artifacts:
    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
    paths:
@@ -303,4 +223,4 @@ release_build_release_for_centos8:
      - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
      - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so        
  only:
-    - tags
+    - tags    
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -37,10 +37,6 @@ 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

@@ -61,10 +57,3 @@ 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 $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/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,6 +12,6 @@ LINK_DIRECTORIES(/opt/MESA/lib)
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)

 add_executable(gtest_jump_layer gtest_jump_layer.cpp)
-target_link_libraries(gtest_jump_layer pcap gtest-static MESA_jump_layer)
+target_link_libraries(gtest_jump_layer pcap gtest-static ${lib_name}_shared)
Author	SHA1	Message	Date
yangwei	d7f3ac99be	🐎 ci(add aarch64 jobs): aarch64 + el9	2024-11-11 14:27:49 +08:00
yangwei	8135b42d14	WIP	2024-11-11 14:09:51 +08:00
yangwei	7ebb3fd553	🐎 ci(add aarch64 jobs): aarch64 + el9	2024-11-11 14:09:11 +08:00
yangwei	2d75ccb51a	🐎 ci(remove el7 jobs): remove centos7 jobs	2024-11-11 13:52:06 +08:00