zuul
/
zuul
Code Issues Proposed changes

Remove ZUUL_PROJECT 

Removing old ZUUL_ env variables which have been replaced with
Ansible variables.

Change-Id: I792dae10c0716b4367c41830428e5c87f81e323e
This commit is contained in:
James E. Blair 2017-07-21 15:30:39 -07:00
parent e675d6858f
commit e536609990
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/base.py
View File

@ -1123,7 +1123,7 @@ class FakeBuild(object):
self.node = self.parameters['nodes'][0]['label']
self.unique = self.parameters['ZUUL_UUID']
self.pipeline = self.parameters['zuul']['pipeline']
self.project = self.parameters['ZUUL_PROJECT']
self.project = self.parameters['zuul']['project']['name']
self.name = self.parameters['job']
self.wait_condition = threading.Condition()
self.waiting = False
@ -2511,7 +2511,7 @@ class ZuulTestCase(BaseTestCase):
for job in self.history:
if (job.name == name and
(project is None or
job.parameters['ZUUL_PROJECT'] == project)):
job.parameters['zuul']['project']['name'] == project)):
return job
raise Exception("Unable to find job %s in history" % name)

3
zuul/executor/client.py
View File

@ -192,8 +192,7 @@ class ExecutorClient(object):
zuul_params['items'].append(d)
# Legacy environment variables
params = dict(ZUUL_UUID=uuid,
ZUUL_PROJECT=item.change.project.name)
params = dict(ZUUL_UUID=uuid)
params['job'] = job.name
params['timeout'] = job.timeout