Merge "Remove zuul._projects"

This commit is contained in:
Zuul 2018-01-30 21:37:15 +00:00 committed by Gerrit Code Review
commit 22c5b7155b
3 changed files with 1 additions and 15 deletions

View File

@ -281,14 +281,6 @@ of item.
msg: "Project {{ item.name }} is at {{ item.src_dir }}
with_items: {{ zuul.projects.values() | list }}
.. var:: _projects
:type: dict
The same as ``projects`` but a dictionary indexed by the
``name`` value of each entry. ``projects`` will be converted to
this.
.. var:: tenant
The name of the current Zuul tenant.

View File

@ -262,12 +262,6 @@ class ExecutorClient(object):
src_dir=os.path.join('src', p.canonical_name),
required=(p in required_projects),
))
# We are transitioning "projects" from a list to a dict
# indexed by canonical name, as it is much easier to access
# values in ansible. Existing callers have been converted to
# "_projects" and "projects" is swapped; we will convert users
# back to "projects" and remove this soon.
zuul_params['_projects'] = zuul_params['projects']
build = Build(job, uuid)
build.parameters = params

View File

@ -713,7 +713,7 @@ class AnsibleJob(object):
project['default_branch'])
# Update the inventory variables to indicate the ref we
# checked out
p = args['zuul']['_projects'][project['canonical_name']]
p = args['zuul']['projects'][project['canonical_name']]
p['checkout'] = selected
# Delete the origin remote from each repo we set up since
# it will not be valid within the jobs.