From 775731b3de0aa8bc41d9597aa53aa801ab4d14d6 Mon Sep 17 00:00:00 2001
From: luqiuwen <luqiuwen@iie.ac.cn>
Date: Fri, 30 Aug 2019 10:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3CI=E8=84=9A=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=9F=BA=E4=BA=8EPULP=E7=9A=84YUM=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 7 ++++---
 ci/travis.sh   | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fb8a64..10f3239 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/ci/travis.sh b/ci/travis.sh
index 0dd4280..24ad8a6 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -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