From 80e1ee94abf1d555cc8e6c42625ea0513458b779 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Wed, 28 Jun 2017 11:05:09 +0100 Subject: ci: fix nightly RPM build Fix the RDT build to use an appropriate version and generate the correct version RPM. Fix the collectd version to only extract collect from the start of the version string. Change-Id: Ifd780059adbed7669c5e259f483018c325de44e6 Signed-off-by: Maryam Tahhan --- ci/utility/collectd_build_rpm.sh | 5 ++--- ci/utility/intel_cmt_cat_build_install_rpm.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh index 086aa979..267dc939 100755 --- a/ci/utility/collectd_build_rpm.sh +++ b/ci/utility/collectd_build_rpm.sh @@ -18,9 +18,8 @@ source $DIR/package-list.sh VERSION="VERSION_NOT_SET" -rm -rf $RPM_WORKDIR cd $COLLECTD_DIR -VERSION=$( $COLLECTD_DIR/version-gen.sh | sed "s/\W$//g" ) +VERSION=$( $COLLECTD_DIR/version-gen.sh | sed "s/^\W$//g" ) $COLLECTD_DIR/build.sh $COLLECTD_DIR/configure make dist @@ -37,4 +36,4 @@ sed --regexp-extended \ --expression="s/without_intel_rdt:[0-9]/without_intel_rdt:1/g" \ $COLLECTD_DIR/contrib/redhat/collectd.spec -rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec \ No newline at end of file +rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec diff --git a/ci/utility/intel_cmt_cat_build_install_rpm.sh b/ci/utility/intel_cmt_cat_build_install_rpm.sh index e91e977b..36cdf379 100755 --- a/ci/utility/intel_cmt_cat_build_install_rpm.sh +++ b/ci/utility/intel_cmt_cat_build_install_rpm.sh @@ -16,7 +16,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $DIR/package-list.sh -VERSION="v0.1.5-1" +VERSION="v1.0.1" bash $DIR/check_git_repo.sh $CMTCAT_DIR $CMTCAT_REPO if [[ $? != 0 ]] -- cgit 1.2.3-korg