summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-06-06 13:04:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-06 13:04:49 +0000
commit477bc4fd49e4eb2481809cc99297eac02d0d6dbe (patch)
tree99c526622e41ca903a7aa4789033562de8fcaf05
parenteb917917740abd33a46177b2f1f40a10a3ee1a20 (diff)
parentae952260f89985455174ac767558242ab14c22f0 (diff)
Merge "ci: remove RPM archiving from Barometer"
-rwxr-xr-xci/utility/collectd_build_rpm.sh6
1 files 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