From ae952260f89985455174ac767558242ab14c22f0 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Mon, 29 May 2017 10:50:40 +0100 Subject: ci: remove RPM archiving from Barometer Remove RPM archiving from Barometer from Barometer and create a new script in the releng repo. Change-Id: Ia6a482bb500038247d274eaa4d8df143c962e1e1 Signed-off-by: Maryam Tahhan --- ci/utility/collectd_build_rpm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh index 2190d074..086aa979 100755 --- a/ci/utility/collectd_build_rpm.sh +++ b/ci/utility/collectd_build_rpm.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 Intel Corporation +# Copyright 2017 Intel Corporation and OPNFV # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ 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" ) $COLLECTD_DIR/build.sh @@ -36,5 +37,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 -gsutil -m cp -r $RPM_WORKDIR/RPMS/* gs://artifacts.opnfv.org/barometer/rpms +rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec \ No newline at end of file -- cgit 1.2.3-korg