Merge "Remove ZUUL_UUID" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index 7b4b3c2..ea7559c 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1121,7 +1121,7 @@
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 @@
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)))
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index d2690ce..dfd4225 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -192,8 +192,7 @@
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