Remove ZUUL_PROJECT
Removing old ZUUL_ env variables which have been replaced with
Ansible variables.
Change-Id: I792dae10c0716b4367c41830428e5c87f81e323e
diff --git a/tests/base.py b/tests/base.py
index d15f39c..d255cf7 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1123,7 +1123,7 @@
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 @@
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)
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index 81aae1f..d2690ce 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,
- ZUUL_PROJECT=item.change.project.name)
+ params = dict(ZUUL_UUID=uuid)
params['job'] = job.name
params['timeout'] = job.timeout