zuul
/
zuul
Code Issues Proposed changes

Remove ZUUL_UUID 

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

Change-Id: I82a3933798a375b1a777e0bf87a45e878a770c1c
This commit is contained in:
James E. Blair 2017-07-21 15:32:01 -07:00
parent e536609990
commit 74f101b418
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/base.py
View File

@ -1121,7 +1121,7 @@ class FakeBuild(object):
self.node = None
if len(self.parameters.get('nodes')) == 1:
self.node = self.parameters['nodes'][0]['label']
self.unique = self.parameters['ZUUL_UUID']
self.unique = self.parameters['zuul']['build']
self.pipeline = self.parameters['zuul']['pipeline']
self.project = self.parameters['zuul']['project']['name']
self.name = self.parameters['job']
@ -1296,11 +1296,11 @@ class RecordingExecutorServer(zuul.executor.server.ExecutorServer):
for build in builds:
if not regex or re.match(regex, build.name):
self.log.debug("Releasing build %s" %
(build.parameters['ZUUL_UUID']))
(build.parameters['zuul']['build']))
build.release()
else:
self.log.debug("Not releasing build %s" %
(build.parameters['ZUUL_UUID']))
(build.parameters['zuul']['build']))
self.log.debug("Done releasing builds %s (%s)" %
(regex, len(self.running_builds)))

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)
params = dict()
params['job'] = job.name
params['timeout'] = job.timeout
params['items'] = merger_items