From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Fri, 1 Dec 2017 13:52:19 +0000 (+0000)
Subject: ci: fix RDT missing package in nightly build
X-Git-Tag: opnfv-6.0.0~62
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7ec62849783cae0ad9ee9c7a25fc274a75a05575;p=barometer.git

ci: fix RDT missing package in nightly build

Change-Id: I0c3d750b798a210cade2cffc73da4620843b6932
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
---

diff --git a/ci/utility/intel_cmt_cat_build_install_rpm.sh b/ci/utility/intel_cmt_cat_build_install_rpm.sh
index a04d0a08..ba6bec07 100755
--- a/ci/utility/intel_cmt_cat_build_install_rpm.sh
+++ b/ci/utility/intel_cmt_cat_build_install_rpm.sh
@@ -22,14 +22,14 @@ bash $DIR/check_git_repo.sh $CMTCAT_DIR $CMTCAT_REPO
 if [[ $? != 0 ]]
 then
 	rm -rf $CMTCAT_DIR
-        git clone --branch $CMTCAT_BRANCH $CMTCAT_REPO $CMTCAT_DIR
+        git clone $CMTCAT_REPO $CMTCAT_DIR
 	else
 	cd $CMTCAT_DIR
 	git reset HEAD --hard
         git pull
-	git checkout -f $CMTCAT_BRANCH
 fi
 cd $CMTCAT_DIR
+git checkout -b intel_rdt $CMTCAT_BRANCH
 wget https://github.com/01org/intel-cmt-cat/archive/${VERSION}.tar.gz --directory-prefix=$CMTCAT_DIR
 mv $CMTCAT_DIR/${VERSION}.tar.gz $RPM_WORKDIR/SOURCES/
 rpmbuild --define "_topdir $RPM_WORKDIR" -bb $CMTCAT_DIR/rpm/intel-cmt-cat.spec
diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 0594e5bb..8cd1a7d8 100755
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -20,7 +20,7 @@ COLLECTD_DIR=$WORKSPACE/collectd
 CMTCAT_DIR=$WORKSPACE/intel-cmt-cat
 
 CMTCAT_REPO=https://github.com/01org/intel-cmt-cat.git
-CMTCAT_BRANCH=master
+CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4
 CMTCAT_VERSION="v1.1.0"
 
 COLLECTD_REPO=https://github.com/collectd/collectd.git