Remove ZUUL_PIPELINE
Removing old ZUUL_ env variables which have been replaced with Ansible variables. Change-Id: I6496caca4bac86e12ff06d14f921ec8f9aafe825
This commit is contained in:
parent
ce125e971f
commit
e675d6858f
|
@ -1122,7 +1122,7 @@ class FakeBuild(object):
|
||||||
if len(self.parameters.get('nodes')) == 1:
|
if len(self.parameters.get('nodes')) == 1:
|
||||||
self.node = self.parameters['nodes'][0]['label']
|
self.node = self.parameters['nodes'][0]['label']
|
||||||
self.unique = self.parameters['ZUUL_UUID']
|
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.project = self.parameters['ZUUL_PROJECT']
|
||||||
self.name = self.parameters['job']
|
self.name = self.parameters['job']
|
||||||
self.wait_condition = threading.Condition()
|
self.wait_condition = threading.Condition()
|
||||||
|
@ -1348,7 +1348,7 @@ class RecordingAnsibleJob(zuul.executor.server.AnsibleJob):
|
||||||
node=build.node, uuid=build.unique,
|
node=build.node, uuid=build.unique,
|
||||||
ref=build.parameters['zuul']['ref'],
|
ref=build.parameters['zuul']['ref'],
|
||||||
parameters=build.parameters, jobdir=build.jobdir,
|
parameters=build.parameters, jobdir=build.jobdir,
|
||||||
pipeline=build.parameters['ZUUL_PIPELINE'])
|
pipeline=build.parameters['zuul']['pipeline'])
|
||||||
)
|
)
|
||||||
self.executor_server.running_builds.remove(build)
|
self.executor_server.running_builds.remove(build)
|
||||||
del self.executor_server.job_builds[self.job.unique]
|
del self.executor_server.job_builds[self.job.unique]
|
||||||
|
|
|
@ -913,11 +913,11 @@ class TestScheduler(ZuulTestCase):
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
for build in self.builds:
|
for build in self.builds:
|
||||||
if build.parameters['ZUUL_PIPELINE'] == 'check':
|
if build.pipeline == 'check':
|
||||||
build.release()
|
build.release()
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
for build in self.builds:
|
for build in self.builds:
|
||||||
if build.parameters['ZUUL_PIPELINE'] == 'check':
|
if build.pipeline == 'check':
|
||||||
build.release()
|
build.release()
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,6 @@ class ExecutorClient(object):
|
||||||
# Legacy environment variables
|
# Legacy environment variables
|
||||||
params = dict(ZUUL_UUID=uuid,
|
params = dict(ZUUL_UUID=uuid,
|
||||||
ZUUL_PROJECT=item.change.project.name)
|
ZUUL_PROJECT=item.change.project.name)
|
||||||
params['ZUUL_PIPELINE'] = pipeline.name
|
|
||||||
|
|
||||||
params['job'] = job.name
|
params['job'] = job.name
|
||||||
params['timeout'] = job.timeout
|
params['timeout'] = job.timeout
|
||||||
|
|
Loading…
Reference in New Issue