commit 6a18fba721f59278880949f7878fe69bdebefa8d
author Jenkins <jenkins@review.openstack.org> Fri Jun 10 21:16:26 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jun 10 21:16:26 2016 +0000
tree de72b473f92f23401972f10e4ea06b49965627cc
parent 246c02c73502e339860d0071c49d2d9ba03d7ebb
parent 28178bf6fc437b92001858b331faf6aa5db8fb2f

Merge "Ansible launcher: fix timeout var"

zuul/launcher/ansiblelaunchserver.py

diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/ansiblelaunchserver.py
index 510d985..5bef6d3 100644
--- a/zuul/launcher/ansiblelaunchserver.py
+++ b/zuul/launcher/ansiblelaunchserver.py
@@ -1000,10 +1000,10 @@
         timeout_var = None
         for wrapper in jjb_job.get('wrappers', []):
             if isinstance(wrapper, dict):
-                timeout = wrapper.get('build-timeout', {})
-                if isinstance(timeout, dict):
-                    timeout = timeout.get('timeout')
-                    timeout_var = timeout.get('timeout-var', None)
+                build_timeout = wrapper.get('build-timeout', {})
+                if isinstance(build_timeout, dict):
+                    timeout_var = build_timeout.get('timeout-var', None)
+                    timeout = build_timeout.get('timeout')
                     if timeout:
                         timeout = timeout * 60
         if not timeout: