natapp project jenkins builder jobs

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

diff --git a/jenkins-scripts/mininet.sh b/jenkins-scripts/mininet.sh
index 3fbcd03f2d78e1e9e036a9799d2eb7b0e3f4c29a..366c5e65b3c2dd74fe96db56ff7593f8739b2f25 100755 (executable)
--- a/jenkins-scripts/mininet.sh
+++ b/jenkins-scripts/mininet.sh
@@ -9,7 +9,11 @@ EOF
 # for whatever reason netopeer & CPqD aren't installed (they weren't in
 # one of the yum repos we were hooked up to when the base image was
 # built, they are now. Make sure they're install
-yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13
+yum install -q -y netopeer-server-sl CPqD-ofsoftswitch13 
+
+# installing sshuttle to create a VPN-ish proxy to VMs that have
+# docker containers on them in order to make them externally accessible
+yum install -q -y sshuttle
 
 # netaddr and ipaddress libraries can be useful on this system as
 # some tests are starting to push pyhon scripts/tools to this VM
@@ -56,6 +60,6 @@ echo 'jenkins' | passwd -f --stdin jenkins
 echo 'root' | passwd -f --stdin root
 
 # make sure the firewall is stopped
-service iptables stop
+/bin/bash disable_firewall.sh
 
 # vim: sw=2 ts=2 sts=2 et :