From 2d75ccb51a44f1806357366d4da8e79fbb2fa166 Mon Sep 17 00:00:00 2001 From: yangwei Date: Mon, 11 Nov 2024 13:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=8E=20ci(remove=20el7=20jobs):=20remov?= =?UTF-8?q?e=20centos7=20jobs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 191 ------------------------------------------------- ci/travis.sh | 11 --- 2 files changed, 202 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bfb836..ae70482 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ 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 INSTALL_PREFIX: "/opt/MESA/lib/" @@ -10,29 +9,6 @@ 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 @@ -49,8 +25,6 @@ google_test_for_centos8: 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: @@ -62,141 +36,19 @@ google_test_for_centos8: - 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: - stage: build - image: $BUILD_IMAGE_CENTOS7 - extends: .build_before_script - script: - - yum install -y libmnl-devel - - yum install -y libnfnetlink-devel - - ./ci/travis.sh - tags: - - share .build_by_travis_for_centos8: 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 - variables: - BUILD_TYPE: Debug - artifacts: - paths: - - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer - - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so - except: - - /^develop.*$/i - - /^master.*$/i - - tags - -branch_build_release_for_centos7: - stage: build - variables: - BUILD_TYPE: RelWithDebInfo - extends: .build_by_travis_for_centos7 - artifacts: - paths: - - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer - - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so - except: - - /^develop.*$/i - - /^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: - 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: 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: - - tags - -release_build_release_for_centos7: - 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 - 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: - - tags - branch_build_debug_for_centos8: stage: build extends: .build_by_travis_for_centos8 @@ -225,48 +77,6 @@ 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: stage: build variables: @@ -291,7 +101,6 @@ release_build_release_for_centos8: 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 diff --git a/ci/travis.sh b/ci/travis.sh index 72c8d5e..840bfc8 100644 --- 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