From f674698583827db52b44f72e64e8ec00305bb239 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Tue, 22 Feb 2022 17:53:36 +0800 Subject: [PATCH] =?UTF-8?q?TSG-9710=20verify-policy=E9=80=82=E9=85=8DRocky?= =?UTF-8?q?=20Linux8.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 229 ++++++++++++++++++------- common/include/verify_policy_logging.h | 2 +- 2 files changed, 171 insertions(+), 60 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df76594..2b42417 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,85 +1,125 @@ -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/verify-policy" 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: +############################################################################### +# The script is set to el7 or el8 +############################################################################### +.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 + - 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 + +.build_by_travis_for_centos7: + stage: build + image: $BUILD_IMAGE_CENTOS7 + extends: .build_before_script script: - - yum makecache - - ./ci/travis.sh - - cd build + - ./ci/travis.sh tags: - - share + - share -branch_build_debug: +.build_by_travis_for_centos8: stage: build - extends: .build_by_travis + image: $BUILD_IMAGE_CENTOS8 + extends: .build_before_script + script: + - ./ci/travis.sh + tags: + - share + +############################################################################### +# compile use image: centos7 +############################################################################### +branch_build_debug_for_centos7: + extends: .build_by_travis_for_centos7 variables: BUILD_TYPE: Debug except: - - /^develop.*$/i - - /^master.*$/i + - /^develop-.*$/i + - /^release-.*$/i - tags -branch_build_release: - stage: build +branch_build_release_for_centos7: variables: BUILD_TYPE: RelWithDebInfo - extends: .build_by_travis + extends: .build_by_travis_for_centos7 except: - - /^develop.*$/i - - /^master.*$/i + - /^develop-.*$/i + - /^release-.*$/i - tags -develop_build_debug: - stage: build - extends: .build_by_travis +develop_build_debug_for_centos7: + extends: .build_by_travis_for_centos7 variables: - BUILD_TYPE: Debug - PACKAGE: 1 - artifacts: - name: "verify-policy-$CI_COMMIT_REF_NAME-debug" - paths: - - build/*.rpm - only: - - /^develop.*$/i - - /^master.*$/i - -develop_build_release: - stage: build - extends: .build_by_travis - variables: - BUILD_TYPE: RelWithDebInfo - PACKAGE: 1 - artifacts: - name: "verify-policy-$CI_COMMIT_REF_NAME-release" - paths: - - build/*.rpm - only: - - /^develop.*$/i - - /^master.*$/i - - -release_build_release: - stage: build - variables: - BUILD_TYPE: RelWithDebInfo - PACKAGE: 1 + TESTING_VERSION_BUILD: 1 UPLOAD: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-testing-x86_64.el7 + PULP3_DIST_NAME: tsg-testing-x86_64.el7 + artifacts: + name: "verify-policy-develop-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^master-.*$/i + +develop_build_release_for_centos7: + extends: .build_by_travis_for_centos7 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD: 1 + BUILD_TYPE: RelWithDebInfo + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-testing-x86_64.el7 + PULP3_DIST_NAME: tsg-testing-x86_64.el7 + artifacts: + name: "verify-policy-develop-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^master-.*$/i + +release_build_debug_for_centos7: + variables: + UPLOAD: 1 + BUILD_TYPE: Debug + PACKAGE: 1 SYMBOL_TARGET: verify-policy 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: "verify-policy-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - tags + +release_build_release_for_centos7: + variables: + BUILD_TYPE: RelWithDebInfo + UPLOAD: 1 + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-stable-x86_64.el7 + PULP3_DIST_NAME: tsg-stable-x86_64.el7 + extends: .build_by_travis_for_centos7 artifacts: name: "verify-policy-$CI_COMMIT_REF_NAME-release" paths: @@ -87,20 +127,91 @@ release_build_release: only: - tags -release_build_debug: - stage: build +############################################################################### +# compile use image: centos8 +############################################################################### +branch_build_debug_for_centos8: + extends: .build_by_travis_for_centos8 variables: BUILD_TYPE: Debug + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +branch_build_release_for_centos8: + variables: + BUILD_TYPE: RelWithDebInfo + extends: .build_by_travis_for_centos8 + except: + - /^develop-.*$/i + - /^release-.*$/i + - tags + +develop_build_debug_for_centos8: + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "verify-policy-develop-$CI_COMMIT_REF_NAME-debug" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +develop_build_release_for_centos8: + extends: .build_by_travis_for_centos8 + variables: + TESTING_VERSION_BUILD: 1 + UPLOAD: 1 BUILD_TYPE: RelWithDebInfo PACKAGE: 1 - UPLOAD: 1 SYMBOL_TARGET: verify-policy - PULP3_REPO_NAME: tsg-stable-x86_64.el7 - PULP3_DIST_NAME: tsg-stable-x86_64.el7 - extends: .build_by_travis + PULP3_REPO_NAME: tsg-testing-x86_64.el8 + PULP3_DIST_NAME: tsg-testing-x86_64.el8 + artifacts: + name: "verify-policy-develop-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - /^develop-.*$/i + - /^release-.*$/i + +release_build_debug_for_centos8: + variables: + UPLOAD: 1 + BUILD_TYPE: Debug + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 artifacts: name: "verify-policy-$CI_COMMIT_REF_NAME-debug" paths: - build/*.rpm only: - tags + +release_build_release_for_centos8: + variables: + BUILD_TYPE: RelWithDebInfo + UPLOAD: 1 + PACKAGE: 1 + SYMBOL_TARGET: verify-policy + PULP3_REPO_NAME: tsg-stable-x86_64.el8 + PULP3_DIST_NAME: tsg-stable-x86_64.el8 + extends: .build_by_travis_for_centos8 + artifacts: + name: "verify-policy-$CI_COMMIT_REF_NAME-release" + paths: + - build/*.rpm + only: + - tags diff --git a/common/include/verify_policy_logging.h b/common/include/verify_policy_logging.h index b2b7d2f..bb44782 100644 --- a/common/include/verify_policy_logging.h +++ b/common/include/verify_policy_logging.h @@ -27,7 +27,7 @@ typedef struct RTLogInit2Data_ { extern RTLogInit2Data logging_sc_lid; /* The maximum length of the log message */ -#define RT_LOG_MAX_LOG_MSG_LEN 2048 +#define RT_LOG_MAX_LOG_MSG_LEN 4096 extern void mesa_logging_print(int log_level, const char *module, const char *msg);