From 4d42dbe063cee4486f76149737b9c1a3b5f65ac1 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Fri, 17 Feb 2023 18:49:07 +0800 Subject: [PATCH] bugfix: CI --- .gitlab-ci.yml | 145 +++++++++++++++++++++++++++++++++++++++++++------ ci/travis.sh | 2 + 2 files changed, 131 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5bbe39..f7015d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,20 @@ -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/ 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 -.build_by_travis: +############################################################################### +# 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 @@ -20,9 +26,9 @@ stages: tags: - share -branch_build_debug: +branch_build_debug_for_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: Debug except: @@ -30,24 +36,24 @@ branch_build_debug: - /^release-.*$/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 - /^release-.*$/i - tags -develop_build_debug: +develop_build_debug_for_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug - ASAN_OPTION: ADDRESS +# ASAN_OPTION: ADDRESS PACKAGE: 1 PULP3_REPO_NAME: tsg-testing-x86_64.el7 PULP3_DIST_NAME: tsg-testing-x86_64.el7 @@ -59,13 +65,13 @@ develop_build_debug: - /^develop-.*$/i - /^release-.*$/i -develop_build_release: +develop_build_release_for_centos7: stage: build - extends: .build_by_travis + extends: .build_by_travis_for_centos7 variables: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 - # ASAN_OPTION: ADDRESS +# ASAN_OPTION: ADDRESS BUILD_TYPE: RelWithDebInfo PACKAGE: 1 PULP3_REPO_NAME: tsg-testing-x86_64.el7 @@ -78,7 +84,7 @@ develop_build_release: - /^develop-.*$/i - /^release-.*$/i -release_build_debug: +release_build_debug_for_centos7: stage: build variables: UPLOAD_SYMBOL_FILES: 1 @@ -86,7 +92,7 @@ release_build_debug: PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis + extends: .build_by_travis_for_centos7 artifacts: name: "sce-install-$CI_COMMIT_REF_NAME-debug" paths: @@ -94,7 +100,7 @@ release_build_debug: only: - tags -release_build_release: +release_build_release_for_centos7: stage: build variables: BUILD_TYPE: RelWithDebInfo @@ -102,10 +108,117 @@ release_build_release: PACKAGE: 1 PULP3_REPO_NAME: tsg-stable-x86_64.el7 PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis + 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 +############################################################################### + +.build_by_travis_for_centos8: + image: $BUILD_IMAGE_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 + tags: + - share + +branch_build_debug_for_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + BUILD_TYPE: Debug + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +branch_build_release_for_centos8: + stage: build + variables: + BUILD_TYPE: RelWithDebInfo + extends: .build_by_travis_for_centos8 + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +develop_build_debug_for_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD_SYMBOL_FILES: 1 + BUILD_TYPE: Debug +# ASAN_OPTION: ADDRESS + PACKAGE: 1 + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "sce-develop-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +develop_build_release_for_centos8: + stage: build + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD_SYMBOL_FILES: 1 +# ASAN_OPTION: ADDRESS + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "sce-develop-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +release_build_debug_for_centos8: + stage: build + variables: + UPLOAD_SYMBOL_FILES: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "sce-install-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - tags + +release_build_release_for_centos8: + stage: build + variables: + BUILD_TYPE: RelWithDebInfo + UPLOAD_SYMBOL_FILES: 1 + PACKAGE: 1 + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "sce-install-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - tags \ No newline at end of file diff --git a/ci/travis.sh b/ci/travis.sh index 3c9d0c3..ce5bd59 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -41,6 +41,8 @@ yum install -y libMESA_prof_load-devel yum install -y librulescan-devel yum install -y sapp-devel # Maat_rule require MESA/stream.h yum install -y libasan +yum install -y numactl-libs # required by mrzcpd +yum install -y libibverbs # required by mrzcpd if [ $ASAN_OPTION ]; then source /opt/rh/devtoolset-7/enable