Merge "Enable batch mode and disable transfer logs"

[releng/builder.git] / packer / provision / devstack-pre-pip.sh

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 1e2a0ccacf2499bb193a77fa1246989236fc0a02..a91d7619d68d843467b6a73d0153f402bf5189e9 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
+# add in a test copr repo
+wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
+# Install xpath
+yum install -y perl-XML-XPath python-pip python-six
+
+# install crudini command line tool for editing config files
+yum install -y crudini
+
 echo '---> Installing non-baseline requirements'
 yum install -y deltarpm nc python{,-{crypto,devel,lxml,setuptools}} \
     @development {lib{xml2,xslt,ffi},openssl}-devel git wget
@@ -32,9 +43,16 @@ do
     pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
 done
 
-echo '---> Installing openvswitch from openstack repo'
-# the newton release has ovs 2.5.0
-yum install -y http://rdoproject.org/repos/openstack-newton/rdo-release-newton.rpm
+if [ "$branch" == "stable/mitaka" ] || [ "$branch" == "stable/liberty" ]; then
+    # the newton release has ovs 2.5.0
+    echo '---> Installing openvswitch from openstack Newton repo (2.5.0)'
+    yum install -y http://rdoproject.org/repos/openstack-newton/rdo-release-newton.rpm
+else
+    # the ocata release has ovs 2.6.1
+    echo '---> Installing openvswitch from openstack Ocata repo (2.6.1)'
+    yum install -y http://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm
+fi
+
 yum install -y --nogpgcheck openvswitch
 
 cd $OLDPWD