Merge "Rename NIC feature"

[releng/builder.git] / jenkins-scripts / devstack.sh

diff --git a/jenkins-scripts/devstack.sh b/jenkins-scripts/devstack.sh
index 63e9c996448cc4471eb4818b3a091111a5269090..0659a3de65c7bd90084bd117e16099b96a7cceae 100755 (executable)
--- a/jenkins-scripts/devstack.sh
+++ b/jenkins-scripts/devstack.sh
@@ -6,9 +6,21 @@ 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
+
+# It looks like the devstack gate is stomping on our dnsmasq setup which
+# therefore kills our ability to do proper lookups of some resources.
+# Let's capture the 3 nexus IPs into /etc/hosts
+cat <<EOHOSTS >> /etc/hosts
+# the internal address for nexus
+$(dig +short nexus.opendaylight.org) nexus.opendaylight.org
+# all the nexus proxies
+$(dig +short nexus01.dfw.opendaylight.org) nexus01.dfw.opendaylight.org
+$(dig +short nexus02.dfw.opendaylight.org) nexus02.dfw.opendaylight.org
+$(dig +short nexus03.ord.opendaylight.org) nexus03.ord.opendaylight.org
+EOHOSTS
 
 # make sure we don't require tty for sudo operations
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults