From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Sat, 10 Sep 2016 18:54:04 +0000 (+0000)
Subject: Merge "docs: Remove top-level index.rst"
X-Git-Tag: danube.1.0~11
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=ovsnfv.git;a=commitdiff_plain;h=1e62084080acac7392eaaecbe1206d1d9cd6af32;hp=8a4594f474bb3144ec45bc7ff88cfd663387e895

Merge "docs: Remove top-level index.rst"
---

diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh
index 5da0e86..f088a4a 100755
--- a/build/build_dpdk_rpm.sh
+++ b/build/build_dpdk_rpm.sh
@@ -74,6 +74,8 @@ mkdir -p $TMPDIR
 
 cd $TMPDIR
 
+install_pre_reqs
+
 mkdir -p $HOME/rpmbuild/RPMS
 mkdir -p $HOME/rpmbuild/SOURCES
 mkdir -p $HOME/rpmbuild/SPECS
diff --git a/build/config b/build/config
index 3181b62..7d4b22f 100644
--- a/build/config
+++ b/build/config
@@ -47,6 +47,12 @@ export OVS_VERSION=7d433ae57ebb90cd68e8fa948a096f619ac4e2d8
 export COPR_DPDK_VERSION=039002f07eb1dd96a061235f0bf0493da386bba2
 export COPR_OVS_VERSION=5e311e125035edc706efbd9cc679f67e5972dbb4 
 #
+# Filename version for frozen features.
+# Corresponds to git hash where last OVS and DPDK feature was added.
+# Embedded in output filenames in artifactory of OVSNFV.
+#
+export filever=e8acab14
+#
 # When KMOD is set, the Linux kernel module is built and tested.
 #
 export KMOD=no
diff --git a/ci/upload_artifacts.sh b/ci/upload_artifacts.sh
index 86774e8..ab661b9 100755
--- a/ci/upload_artifacts.sh
+++ b/ci/upload_artifacts.sh
@@ -22,13 +22,12 @@ 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-$gitver
-    gsutil cp $TMP_RELEASE_DIR/$i gs://$GS_URL/ovs4opnfv-$gitver-$i
+    echo copying $i to gs://$GS_URL/ovs4opnfv-$filever
+    gsutil cp $TMP_RELEASE_DIR/$i gs://$GS_URL/ovs4opnfv-$filever-$i
     echo
 done