From: Thomas F Herbert <therbert@redhat.com>
Date: Thu, 30 Jun 2016 16:30:18 +0000 (+0000)
Subject: Merge "RPM: Apex: Add git hash substring to file name to create version ID of RPMs... 
X-Git-Tag: colorado.1.0~15
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=329305235137adb72f9e8736f78f21fff3ec2ed6;hp=6f971f00a354bd68af0ca6b55ab00c5d1c1dfa0f;p=ovsnfv.git

Merge "RPM: Apex: Add git hash substring to file name to create version ID of RPMs in artifactory. Rebased to latest."
---

diff --git a/ci/upload_artifacts.sh b/ci/upload_artifacts.sh
index 45128bd..86774e8 100755
--- a/ci/upload_artifacts.sh
+++ b/ci/upload_artifacts.sh
@@ -22,12 +22,13 @@ set -o pipefail
 echo "Uploading the OVS and DPDK RPM artifacts. "
 echo "-----------------------------------------"
 echo
+gitver=`git log --pretty=oneline -n1|cut -c1-8`
 
 cd $TMP_RELEASE_DIR
 for i in `ls *.rpm`
 do
-    echo copying $i to gs://$GS_URL/ovs4opnfv
-    gsutil cp $TMP_RELEASE_DIR/$i gs://$GS_URL/ovs4opnfv-$i
+    echo copying $i to gs://$GS_URL/ovs4opnfv-$gitver
+    gsutil cp $TMP_RELEASE_DIR/$i gs://$GS_URL/ovs4opnfv-$gitver-$i
     echo
 done