From 5a56b3b58af64716e455be584e6c881429e61b61 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 28 Feb 2018 19:27:27 +0100 Subject: [PATCH] buildpackages: sleep first in the wait/backoff loop Signed-off-by: Nathan Cutler --- teuthology/task/buildpackages/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/task/buildpackages/Makefile b/teuthology/task/buildpackages/Makefile index 5ff0dacfda..9de81db4be 100644 --- a/teuthology/task/buildpackages/Makefile +++ b/teuthology/task/buildpackages/Makefile @@ -39,7 +39,7 @@ flock-${PKG_REPO}: sleep 30 set -ex ; \ ip=$(call get_ip,${PKG_REPO}) ; \ - for delay in 60 60 60 2 2 2; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else echo "ssh status code $$?" ; sleep $$delay ; fi ; done ; \ + for delay in 60 60 60 60 2 2 2; do sleep $$delay ; if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else echo "ssh status code $$?" ; fi ; done ; \ ssh $$ip sudo apt-get update ; \ ssh $$ip sudo apt-get install -y nginx rsync && \ ssh $$ip sudo chown -R ubuntu /usr/share/nginx/html && \ @@ -72,7 +72,7 @@ ${SELFNAME}-ceph-${CEPH_PKG_TYPE}-${CEPH_DIST}-${CEPH_ARCH}-${CEPH_FLAVOR}-${CEP done ; \ ip=$(call get_ip,$@) ; \ test -n "$$ip" || exit ; \ - for delay in 60 60 60 2 2 2 ; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else echo "ssh status code $$?" ; sleep $$delay ; fi ; done ; \ + for delay in 60 60 60 60 2 2 2 ; do sleep $$delay ; if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else echo "ssh status code $$?" ; fi ; done ; \ scp make-${CEPH_PKG_TYPE}.sh common.sh ubuntu@$$ip: ; \ packages_repository=$(call get_ip,${