Merge "Migrate cardinal matrix-verify jobs to freestyle-verify jobs"

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

diff --git a/jjb/netvirt/include-raw-setup-docker.sh b/jjb/netvirt/include-raw-setup-docker.sh
index 6056b741afb704612cf764e1c63bbd307e093832..2191c52aba2835cb70c64f3f237c331b49897f1d 100644 (file)
--- a/jjb/netvirt/include-raw-setup-docker.sh
+++ b/jjb/netvirt/include-raw-setup-docker.sh
@@ -11,7 +11,7 @@ do
    docker rm "$x"
 done
 
-for x in $(docker images | egrep -e 'davetucker|mgkwill|socketplane' | awk '{print $3}')
+for x in $(docker images | grep vpickard | awk '{print $3}')
 do
    docker rmi "$x"
 done
@@ -19,9 +19,13 @@ done
 
 
 echo "---> Starting OVS $OVS_VERSION"
-/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)
+/usr/bin/docker pull vpickard/openvswitch:$OVS_VERSION
+CID=$(/usr/bin/docker run -p 6641:6640 --privileged=true -d -i -t vpickard/openvswitch:$OVS_VERSION /usr/bin/supervisord)
 REALCID=`echo $CID | rev | cut -d ' ' -f 1 | rev`
+echo "---> Waiting to start OVS HW VTEP Emulator"
+sleep 5
+echo "---> Starting OVS HW VTEP Emulator"
+/usr/bin/docker exec $REALCID supervisorctl start ovs-vtep
 echo "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
 CONTROLLER_IP=`facter ipaddress`