Do more than just sleep and raise an exception.

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 91b43c4a181b9ad1e6731e832a4c3887c6f587d5..9fd907b87c0351c3458327c1494f5e653b167a2f 100644 (file)
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -671,7 +671,10 @@ def _upgrade_deb_packages(ctx, config, remote, debs, branch):
             check_status=False,
         )
         if r.exitstatus != 0:
-            time.sleep(15)
+            if config.get('wait_for_package'):
+                log.info('Package not there yet, waiting...')
+                time.sleep(15)
+                continue
             raise Exception('failed to fetch package version from %s' %
                             base_url + '/version')
         version = r.stdout.getvalue().strip()