Merge "Use 2c-2g system for update-csit jobs"

[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 a91d7619d68d843467b6a73d0153f402bf5189e9..3e129f80c07bede1990ba736578c95cdf76518e3 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -22,40 +22,49 @@ fi
 
 echo '---> Pre-installing yum and pip packages'
 projs="requirements keystone glance cinder neutron nova horizon"
+# shellcheck disable=SC2154
 branch=${os_branch}
+# strip the "stable" off of the branch
+branch_name=$(cut -d'/' -f2 <<< "${branch}")
 
-wget https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
+# Do not upgrade pip to v10. v10 does not allow uninstalling
+# distutils installed packages. This fails the openstack pip installs
+# below when it attempts to uninstall packages.
+# devstack patch that is trying to get pip 10 working:
+# https://review.openstack.org/#/c/561597/
+# wget https://bootstrap.pypa.io/get-pip.py
+# python get-pip.py
 
 mkdir tmp
 cd tmp
 
 git clone https://github.com/openstack-dev/devstack.git
-(cd devstack && git checkout ${branch})
+(cd devstack && git checkout "${branch}")
 sed -e 's/#.*//' devstack/files/rpms/general | xargs yum install -y
 
 base_url=https://github.com/openstack/
 for proj in $projs
 do
-    git clone ${base_url}${proj}
-    (cd ${proj} && git checkout ${branch})
-    pip install -c requirements/upper-constraints.txt -e ${proj}
-    pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
+    git clone "${base_url}${proj}"
+    (cd "${proj}" && git checkout "${branch}")
+    pip install -c requirements/upper-constraints.txt -e "${proj}"
+    pip install -c requirements/upper-constraints.txt -r "${proj}/test-requirements.txt"
 done
 
-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
+echo '---> Installing openvswitch from relevant openstack branch'
+yum install -y "centos-release-openstack-${branch_name}"
+
+# install 2.8.2 for queens.
+# 2.9.0 is the current version in openstack-queens, but it is buggy.
+# Remove this when https://review.rdoproject.org/r/#/c/13839/ merges and 2.9.2 is in the repo.
+yum repolist
+yum --showduplicates list openvswitch
+if [ "${branch}" == "stable/queens" ]; then
+    yum install -y --nogpgcheck openvswitch-2.8.2-1.el7
 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
+    yum install -y --nogpgcheck openvswitch
 fi
-
-yum install -y --nogpgcheck openvswitch
-
-cd $OLDPWD
+cd "$OLDPWD"
 rm -fr tmp
 
 # vim: sw=4 ts=4 sts=4 et :