Fix a race condition that would cause the lxd image caching to fail if

the network interface doesn't have an ip address fast enough.

Signed-off-by: Adam Israel <adam.israel@canonical.com>
Change-Id: I5a81ebd0456c509e479461e9d5149a309b960d25

diff --git a/jenkins/VCA/update-lxd-image.sh b/jenkins/VCA/update-lxd-image.sh
index ce14b1d..182a33c 100755 (executable)
--- a/jenkins/VCA/update-lxd-image.sh
+++ b/jenkins/VCA/update-lxd-image.sh
@@ -28,7 +28,9 @@ function cache() {
 
     lxc delete $container -f || true
     lxc launch ubuntu:$series $container
-    sleep 5  # wait for network
+
+    # Wait for the container to get an IP address
+    lxc exec $container -- bash -c "for i in {1..60}; do sleep 1; ping -c1 10.44.127.1 &> /dev/null && break; done"
 
     lxc exec $container -- apt-get update -y
     lxc exec $container -- apt-get upgrade -y