From e675d6858f012125b0ae4cdf277e5ae87559e48a Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Fri, 21 Jul 2017 15:29:35 -0700
Subject: [PATCH] Remove ZUUL_PIPELINE

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

Change-Id: I6496caca4bac86e12ff06d14f921ec8f9aafe825
---
 tests/base.py                | 4 ++--
 tests/unit/test_scheduler.py | 4 ++--
 zuul/executor/client.py      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/base.py b/tests/base.py
index 2b6147af19..d15f39cc66 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1122,7 +1122,7 @@ class FakeBuild(object):
         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 @@ class RecordingAnsibleJob(zuul.executor.server.AnsibleJob):
                          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 7ae0bd11af..5fecfbefb2 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -913,11 +913,11 @@ class TestScheduler(ZuulTestCase):
         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()
 
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index f78e6686b8..81aae1f374 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -194,7 +194,6 @@ class ExecutorClient(object):
         # Legacy environment variables
         params = dict(ZUUL_UUID=uuid,
                       ZUUL_PROJECT=item.change.project.name)
-        params['ZUUL_PIPELINE'] = pipeline.name
 
         params['job'] = job.name
         params['timeout'] = job.timeout