Push OpFlex artifacts to Nexus repository.

[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 2191c52aba2835cb70c64f3f237c331b49897f1d..23f457545e9804933d570e0686142b2d70817566 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.2}
+OVS_VERSION=${OVS_VERSION:-2.5.0}
 
 echo "---> Cleaning up existing Docker processes and images"
 for x in $(docker ps -a -q)
@@ -19,16 +19,12 @@ done
 
 
 echo "---> Starting OVS $OVS_VERSION"
-/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
+/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 "CID=$REALCID" > env.properties
 echo "OVS_VERSION=${OVS_VERSION}" >> env.properties
-CONTROLLER_IP=`facter ipaddress`
+CONTROLLER_IP=$(facter ipaddress)
 echo "CONTROLLER_IP=${CONTROLLER_IP}" >> env.properties
 
 echo "---> Waiting..."