buildpackages: change wait/backoff intervals

The sshd in SLE15 is more paranoid and does not tolerate much banging on port 22:

+ sleep 8
+ for delay in 1 2 4 8 8 8 8 8 8 8 8 8 16 16 16 16 16 32 32 32 64 128 256 512
+ ssh -o ConnectTimeout=3 137.74.26.189 bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"'
Warning: Permanently added '137.74.26.189' (ECDSA) to the list of known hosts.
Received disconnect from 137.74.26.189 port 22:2: Too many authentication failures

Also log the ssh status code.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/task/buildpackages/Makefile b/teuthology/task/buildpackages/Makefile
index b1ee16b93929032fd0e51fa5f53931c9639764ca..5ff0dacfda180a5908f0b86291e64d6a67ac210f 100644 (file)
--- 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 1 2 4 8 8 8 8 8 8 8 8 8 16 16 16 16 16 32 32 32 64 128 256 512 ; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else sleep $$delay ; fi ; done ; \
+       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 ; \
        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 1 2 4 8 8 8 8 8 8 8 8 8 16 16 16 16 16 32 32 32 64 128 256 512 ; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else sleep $$delay ; fi ; done ; \
+       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 ; \
        scp make-${CEPH_PKG_TYPE}.sh common.sh ubuntu@$$ip: ; \
        packages_repository=$(call get_ip,${<F}) ; \
        timeout $(TIMEOUT_BUILD) ssh -tt -A ubuntu@$$ip bash ./make-${CEPH_PKG_TYPE}.sh $$packages_repository ${CEPH_DIST} ${CEPH_GIT_URL} ${CEPH_SHA1} ${CEPH_FLAVOR} ${CEPH_ARCH} ${BUILDPACKAGES_CANONICAL_TAGS}