Make sure python-pip gets installed

Had the python-pip install as part of an update operation. Yum won't
install something that isn't already installedy when doing an update.
Make sure that the python-pip happens during the install call instead.

Change-Id: I337209cfc5d32839b2d20c6c25fc28359dd2cb80
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jenkins-scripts/devstack.sh b/jenkins-scripts/devstack.sh
index 63e9c996448cc4471eb4818b3a091111a5269090..1b8da7b070782abd622e3470b6ce82fbef8e6a02 100755 (executable)
--- a/jenkins-scripts/devstack.sh
+++ b/jenkins-scripts/devstack.sh
@@ -6,9 +6,9 @@ wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-o
 yum clean all
 
 # Install xpath
-yum install -y perl-XML-XPath
+yum install -y perl-XML-XPath python-pip
 
-yum update -y python-{six,pip}
+yum update -y python-six
 
 # make sure we don't require tty for sudo operations
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults