Remove ZUUL_PIPELINE
Removing old ZUUL_ env variables which have been replaced with
Ansible variables.
Change-Id: I6496caca4bac86e12ff06d14f921ec8f9aafe825
diff --git a/tests/base.py b/tests/base.py
index 2b6147a..d15f39c 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1122,7 +1122,7 @@
if len(self.parameters.get('nodes')) == 1:
self.node = self.parameters['nodes'][0]['label']
self.unique = self.parameters['ZUUL_UUID']
- self.pipeline = self.parameters['ZUUL_PIPELINE']
+ self.pipeline = self.parameters['zuul']['pipeline']
self.project = self.parameters['ZUUL_PROJECT']
self.name = self.parameters['job']
self.wait_condition = threading.Condition()
@@ -1348,7 +1348,7 @@
node=build.node, uuid=build.unique,
ref=build.parameters['zuul']['ref'],
parameters=build.parameters, jobdir=build.jobdir,
- pipeline=build.parameters['ZUUL_PIPELINE'])
+ pipeline=build.parameters['zuul']['pipeline'])
)
self.executor_server.running_builds.remove(build)
del self.executor_server.job_builds[self.job.unique]
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 7ae0bd1..5fecfbe 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -913,11 +913,11 @@
self.waitUntilSettled()
for build in self.builds:
- if build.parameters['ZUUL_PIPELINE'] == 'check':
+ if build.pipeline == 'check':
build.release()
self.waitUntilSettled()
for build in self.builds:
- if build.parameters['ZUUL_PIPELINE'] == 'check':
+ if build.pipeline == 'check':
build.release()
self.waitUntilSettled()