Merge "Rename work_dir/git to work_dir/src" into feature/zuulv3
diff --git a/zuul/ansible/library/zuul_console.py b/zuul/ansible/library/zuul_console.py
index 3c488ca..1932cf9 100644
--- a/zuul/ansible/library/zuul_console.py
+++ b/zuul/ansible/library/zuul_console.py
@@ -165,7 +165,7 @@
def main():
module = AnsibleModule(
argument_spec=dict(
- path=dict(default=LOG_STREAM_PATH),
+ path=dict(default=LOG_STREAM_FILE),
port=dict(default=LOG_STREAM_PORT, type='int'),
)
)
diff --git a/zuul/launcher/client.py b/zuul/launcher/client.py
index d9e7d21..f36e2a7 100644
--- a/zuul/launcher/client.py
+++ b/zuul/launcher/client.py
@@ -259,7 +259,10 @@
dependent_items.reverse()
# TODOv3(jeblair): This ansible vars data structure will
# replace the environment variables below.
- zuul_params = dict(uuid=uuid)
+ zuul_params = dict(uuid=uuid,
+ project=item.change.project.name)
+ if hasattr(item.change, 'branch'):
+ zuul_params['branch'] = item.change.branch
# Legacy environment variables
params = dict(ZUUL_UUID=uuid,
ZUUL_PROJECT=item.change.project.name)
@@ -267,6 +270,7 @@
params['ZUUL_URL'] = item.current_build_set.zuul_url
params['ZUUL_VOTING'] = job.voting and '1' or '0'
if hasattr(item.change, 'refspec'):
+ zuul_params['branch'] = item.change.branch
changes_str = '^'.join(
['%s:%s:%s' % (i.change.project.name, i.change.branch,
i.change.refspec)