From 408d65557f2a4c0e005babc3985e1f5b175d3049 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 23 Feb 2017 14:00:22 -0500 Subject: [PATCH] Add project and branch to ansible zuul vars Change-Id: Ia94ec597fd7d661a6f04bb97210e7d684d783571 --- zuul/launcher/client.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zuul/launcher/client.py b/zuul/launcher/client.py index d9e7d214f0..f36e2a7941 100644 --- a/zuul/launcher/client.py +++ b/zuul/launcher/client.py @@ -259,7 +259,10 @@ class LaunchClient(object): 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 @@ class LaunchClient(object): 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)