diff options
| -rw-r--r-- | .gitlab-ci.yml | 165 | ||||
| -rw-r--r-- | ci/travis.sh | 11 |
2 files changed, 46 insertions, 130 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c24dec..72791a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_STRATEGY: "clone" - BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master" - BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" + 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" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_DEPENDENCY_LIBRARY: libasan INSTALL_PREFIX: "/opt/MESA/" @@ -9,42 +9,31 @@ variables: stages: - build + .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 - chmod +x ./ci/travis.sh - - yum makecache - - 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 - - cd build - tags: - - share +############################################################################### +# build on x86_64 Rocky8 +############################################################################### -.build_by_travis_for_centos8: +.build_by_travis_for_x86_64_rocky8: stage: build - image: $BUILD_IMAGE_CENTOS8 + image: $BUILD_IMAGE_X86_64_ROCKY8 extends: .build_before_script script: - - dnf --enablerepo=powertools install -y libmnl-devel - - dnf --enablerepo=powertools install -y libnfnetlink-devel - ./ci/travis.sh tags: - - share + - tsg-os-builder-el8 -branch_build_debug_for_centos7: +branch_build_debug_for_x86_64_rocky8: stage: build - extends: .build_by_travis_for_centos7 + extends: .build_by_travis_for_x86_64_rocky8 variables: BUILD_TYPE: Debug except: @@ -52,62 +41,25 @@ 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 except: - /^develop.*$/i - /^master.*$/i - tags -develop_build_debug_for_centos7: +release_build_debug_for_x86_64_rocky8: 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-debug" - paths: - - 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 - TESTING_VERSION_BUILD: 1 - PULP3_REPO_NAME: framework-testing-x86_64.el7 - PULP3_DIST_NAME: framework-testing-x86_64.el7 - artifacts: - name: "MESA_field_stat2-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - 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 + 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-debug" paths: @@ -115,7 +67,7 @@ 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 @@ -123,9 +75,9 @@ release_build_release_for_centos7: UPLOAD_RPM: 1 UPLOAD_SYMBOL_FILES: 1 SYMBOL_TARGET: libMESA_field_stat2 - 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-release" paths: @@ -133,9 +85,22 @@ release_build_release_for_centos7: only: - tags -branch_build_debug_for_centos8: +############################################################################### +# 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 except: @@ -143,62 +108,25 @@ 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 except: - /^develop.*$/i - /^master.*$/i - tags -develop_build_debug_for_centos8: +release_build_debug_for_aarch64_rocky9: 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-debug" - paths: - - 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 - TESTING_VERSION_BUILD: 1 - PULP3_REPO_NAME: framework-testing-x86_64.el8 - PULP3_DIST_NAME: framework-testing-x86_64.el8 - artifacts: - name: "MESA_field_stat2-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - only: - - /^develop.*$/i - - /^master.*$/i - -release_build_debug_for_centos8: - 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-debug" paths: @@ -206,17 +134,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_field_stat2 - 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: "MESA_field_stat2-$CI_COMMIT_REF_NAME-release" paths: diff --git a/ci/travis.sh b/ci/travis.sh index 3cfc243..47f3db4 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 @@ -63,10 +59,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 |