adding exabgp to the tools vm

[releng/builder.git] / jjb / ovsdb / include-raw-setup-docker.sh

diff --git a/jjb/ovsdb/include-raw-setup-docker.sh b/jjb/ovsdb/include-raw-setup-docker.sh
index 6afd6f60800a23171c06a6065ac81584af90c708..6056b741afb704612cf764e1c63bbd307e093832 100644 (file)
--- a/jjb/ovsdb/include-raw-setup-docker.sh
+++ b/jjb/ovsdb/include-raw-setup-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-OVS_VERSION=${OVS_VERSION:-2.3.0}
+OVS_VERSION=${OVS_VERSION:-2.3.2}
 
 echo "---> Cleaning up existing Docker processes and images"
 for x in $(docker ps -a -q)
@@ -11,7 +11,7 @@ do
    docker rm "$x"
 done
 
-for x in $(docker images | grep davetucker | awk '{print $3}')
+for x in $(docker images | egrep -e 'davetucker|mgkwill|socketplane' | awk '{print $3}')
 do
    docker rmi "$x"
 done
@@ -19,11 +19,13 @@ done
 
 
 echo "---> Starting OVS $OVS_VERSION"
-/usr/bin/docker pull davetucker/docker-ovs:$OVS_VERSION
-CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t davetucker/docker-ovs:$OVS_VERSION /usr/bin/supervisord)
+/usr/bin/docker pull mgkwill/openvswitch:$OVS_VERSION
+CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t mgkwill/openvswitch:$OVS_VERSION /usr/bin/supervisord)
 REALCID=`echo $CID | rev | cut -d ' ' -f 1 | rev`
 echo "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
+CONTROLLER_IP=`facter ipaddress`
+echo "CONTROLLER_IP=${CONTROLLER_IP}" >> env.properties
 
 echo "---> Waiting..."
 sleep 10