修正CI脚本,适配基于PULP的YUM仓库。

This commit is contained in:
luqiuwen
2019-08-30 10:22:36 +08:00
committed by 陆秋文
parent a44578f80b
commit 775731b3de
2 changed files with 6 additions and 3 deletions

View File

@@ -11,7 +11,8 @@ stages:
.build_by_travis:
before_script:
- pulp-consumer register -u $PULP_CI_USER -p $PULP_CI_PASSWORD --consumer-id gitlab-ci-$CI_JOB_NAME-$CI_JOB_ID
- pulp-consumer -u $PULP_CI_USER -p $PULP_CI_PASSWORD register --consumer-id gitlab-ci-$CI_JOB_NAME-$CI_JOB_ID
- pulp-consumer rpm bind --repo-id $FRAMEWORK_REPO_ID
- 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
@@ -22,12 +23,12 @@ stages:
build_debug:
stage: build
variables:
FRAMEWORK_REPO_ID: mesa-framework-stable
BUILD_TYPE: Debug
extends: .build_by_travis
script:
- pulp-consumer rpm bind --repo-id stable
- yum makecache
- yum install mrzcpd framework
- ./ci/travis.sh
tags:
- share
@@ -37,10 +38,10 @@ build_debug:
build_release:
stage: build
variables:
FRAMEWORK_REPO_ID: mesa-framework-stable
BUILD_TYPE: RelWithDebInfo
extends: .build_by_travis
script:
- pulp-consumer rpm bind --repo-id stable
- yum makecache
- yum install mrzcpd framework
- ./ci/travis.sh

View File

@@ -30,6 +30,8 @@ env | sort
: "${NO_RTTI:=OFF}"
: "${COMPILER_IS_GNUCXX:=OFF}"
# Install dependency from YUM
yum install -y mrzcpd framework zlib-devel librdkafka-devel
mkdir build || true
cd build