Merge "Support testing with any OVS version"

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

diff --git a/jenkins-scripts/devstack.sh b/jenkins-scripts/devstack.sh
index ef75eb3af58052cd96f7ff80510ee51b6730c7b0..d8a87327650ab8a0625af634359eb5b0f0e47319 100755 (executable)
--- a/jenkins-scripts/devstack.sh
+++ b/jenkins-scripts/devstack.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 
-# 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
-
-yum clean all
-
-# Install xpath
-yum install -y perl-XML-XPath
-
-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
 Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
 EOF
 
 # vim: sw=2 ts=2 sts=2 et :