X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Futility%2Fintel_cmt_cat_build_install_rpm.sh;fp=ci%2Futility%2Fintel_cmt_cat_build_install_rpm.sh;h=a04d0a08df92125fc245e4f41f3e0ee80a519f1a;hb=6d04906c750be1fac4566762fd444397e90d75a8;hp=36cdf3796f3e0e89a6df1006dacbc31bffe5d09d;hpb=bb4cd4a808844bad8cf42617fbbd29f24c4308e8;p=barometer.git

diff --git a/ci/utility/intel_cmt_cat_build_install_rpm.sh b/ci/utility/intel_cmt_cat_build_install_rpm.sh
index 36cdf379..a04d0a08 100755
--- a/ci/utility/intel_cmt_cat_build_install_rpm.sh
+++ b/ci/utility/intel_cmt_cat_build_install_rpm.sh
@@ -16,35 +16,31 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $DIR/package-list.sh
 
-VERSION="v1.0.1"
+VERSION=$CMTCAT_VERSION
 
 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
-else
+        git clone --branch $CMTCAT_BRANCH $CMTCAT_REPO $CMTCAT_DIR
+	else
 	cd $CMTCAT_DIR
 	git reset HEAD --hard
-	git pull
+        git pull
 	git checkout -f $CMTCAT_BRANCH
 fi
-
 cd $CMTCAT_DIR
-make
-sudo make install
-
 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
 
-rpm -q intel-cmt-cat
+rpm -q intel-cmt-cat-devel
 if [ $? -eq 0 ]
 then
-	echo "*** intel-cmt-cat is already installed"
+        echo "*** intel-cmt-cat-devel is already installed"
 else
-	RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-[0-9]"`
-	sudo rpm -ivf $RPM_DIR/$RPM_NAME
+        RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-[0-9]"`
+        sudo rpm -ivf $RPM_DIR/$RPM_NAME
+        RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-devel-[0-9]"`
+        sudo rpm -ivf $RPM_DIR/$RPM_NAME
 fi