Merge lp:~doanac/ubuntu-ci-services-itself/lander-retry-1289296 into lp:ubuntu-ci-services-itself

[Andy Doan]

lander: try forever to connect to jenkins and ticket-system

There's no point ever giving up on connecting

fixes the issue where the lander stopped trying to connect to jenkins and the ticket system

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:353
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/379/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/379/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Approve

review: Approve

=== modified file 'lander/lander/run_worker.py'
--- lander/lander/run_worker.py	2014-03-10 22:25:00 +0000
+++ lander/lander/run_worker.py	2014-03-11 19:08:49 +0000
@@ -26,7 +26,6 @@
 from ci_utils import jenkins_utils
 from ci_utils import dump_stack
 
-MAX_RETRIES = 15
 SERVICE_PATH = os.path.join(os.path.dirname(__file__), '../../juju-relations')
 
 # set up a root logger for everything
@@ -120,38 +119,24 @@
 
 
 def main(args):
-    retries = MAX_RETRIES
     logging.info('Starting lander-jenkins worker.')
-    while retries:
+    while True:
         logging.info('Trying to acquire jenkins config.')
         jenkins_config = jenkins_utils.get_config()
         if not jenkins_config:
-            retries -= 1
-            logging.error('Unable to acquire jenkins configuration, '
-                          'will retry {} more times.'.format(retries))
+            logging.error('Unable to acquire jenkins configuration, retrying')
             time.sleep(args.delay)
         else:
             break
-    if not retries:
-        logging.error('Failed to acquire jenkins configuration, '
-                      'no more retries.')
-        return -1
 
-    retries = MAX_RETRIES
-    while retries:
+    while True:
         logging.info('Trying to acquire ticket service url.')
         service_url = get_service_url(args.service_name, args.service_port)
         if not service_url:
-            retries -= 1
-            logging.error('Unable to acquire ticket service url, '
-                          'will retry {} more times.'.format(retries))
+            logging.error('Unable to acquire ticket service url, retrying')
             time.sleep(args.delay)
         else:
             break
-    if not retries:
-        logging.error('Failed to acquire ticket service url, '
-                      'no more retries.')
-        return -1
 
     while True:
         logging.info('Polling for a new ticket')