zuul
/
zuul
Code Issues Proposed changes

Merge "Stop double-logging the build id" into feature/zuulv3

This commit is contained in:
Jenkins 2017-07-27 22:45:41 +00:00 committed by Gerrit Code Review
parent b001e8a699 e16e6481e1
commit ad2f6773a6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zuul/executor/server.py
View File

@ -818,8 +818,7 @@ class AnsibleJob(object):
# Make sure all projects used by the job are updated...
for project in args['projects']:
self.log.debug("Job %s: updating project %s" %
(self.job.unique, project))
self.log.debug("Updating project %s" % (project,))
tasks.append(self.executor_server.update(
project['connection'], project['name']))
projects.add((project['connection'], project['name']))
@ -833,8 +832,7 @@ class AnsibleJob(object):
repos += playbook['roles']
for repo in repos:
self.log.debug("Job %s: updating playbook or role %s" %
(self.job.unique, repo))
self.log.debug("Updating playbook or role %s" % (repo,))
key = (repo['connection'], repo['project'])
if key not in projects:
tasks.append(self.executor_server.update(*key))
@ -843,7 +841,7 @@ class AnsibleJob(object):
for task in tasks:
task.wait()
self.log.debug("Job %s: git updates complete" % (self.job.unique,))
self.log.debug("Git updates complete")
merger = self.executor_server._getMerger(self.jobdir.src_root,
self.log)
repos = {}