From a438c170371a801dffaea61acaa46ba10a95cb52 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 21 Jul 2017 14:54:42 -0700 Subject: [PATCH] Remove ZUUL_REF Removing old ZUUL_ env variables which have been replaced with Ansible variables. Change-Id: Iaeac4ac51c518fe4042a1287de16c6fafccc1d6b --- tests/unit/test_github_driver.py | 4 ++-- tests/unit/test_scheduler.py | 15 --------------- zuul/executor/client.py | 5 ----- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/tests/unit/test_github_driver.py b/tests/unit/test_github_driver.py index 88408fad5c..ec90cd6f85 100644 --- a/tests/unit/test_github_driver.py +++ b/tests/unit/test_github_driver.py @@ -113,7 +113,7 @@ class TestGithubDriver(ZuulTestCase): self.waitUntilSettled() build_params = self.builds[0].parameters - self.assertEqual('refs/tags/newtag', build_params['ZUUL_REF']) + self.assertEqual('refs/tags/newtag', build_params['zuul']['ref']) self.assertEqual('00000000000000000000000000000000', build_params['zuul']['oldrev']) self.assertEqual(sha, build_params['zuul']['newrev']) @@ -137,7 +137,7 @@ class TestGithubDriver(ZuulTestCase): self.waitUntilSettled() build_params = self.builds[0].parameters - self.assertEqual('refs/heads/master', build_params['ZUUL_REF']) + self.assertEqual('refs/heads/master', build_params['zuul']['ref']) self.assertEqual(old_sha, build_params['zuul']['oldrev']) self.assertEqual(new_sha, build_params['zuul']['newrev']) diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py index 929f34bbf5..f54465d6ae 100755 --- a/tests/unit/test_scheduler.py +++ b/tests/unit/test_scheduler.py @@ -2033,34 +2033,19 @@ class TestScheduler(ZuulTestCase): self.executor_server.release('.*-merge') self.waitUntilSettled() - a_zref = b_zref = c_zref = d_zref = None a_build = b_build = c_build = d_build = None for x in self.builds: if x.parameters['ZUUL_CHANGE'] == '3': - a_zref = x.parameters['ZUUL_REF'] a_build = x elif x.parameters['ZUUL_CHANGE'] == '4': - b_zref = x.parameters['ZUUL_REF'] b_build = x elif x.parameters['ZUUL_CHANGE'] == '5': - c_zref = x.parameters['ZUUL_REF'] c_build = x elif x.parameters['ZUUL_CHANGE'] == '6': - d_zref = x.parameters['ZUUL_REF'] d_build = x if a_build and b_build and c_build and d_build: break - # There are... four... refs. - self.assertIsNotNone(a_zref) - self.assertIsNotNone(b_zref) - self.assertIsNotNone(c_zref) - self.assertIsNotNone(d_zref) - - # And they should all be different - refs = set([a_zref, b_zref, c_zref, d_zref]) - self.assertEqual(len(refs), 4) - # should have a, not b, and should not be in project2 self.assertTrue(a_build.hasChanges(A)) self.assertFalse(a_build.hasChanges(B, M2)) diff --git a/zuul/executor/client.py b/zuul/executor/client.py index ca09dc32b8..e5a7eb1048 100644 --- a/zuul/executor/client.py +++ b/zuul/executor/client.py @@ -203,9 +203,6 @@ class ExecutorClient(object): for i in all_items]) params['ZUUL_BRANCH'] = item.change.branch params['ZUUL_CHANGES'] = changes_str - params['ZUUL_REF'] = ('refs/zuul/%s/%s' % - (item.change.branch, - item.current_build_set.ref)) zuul_changes = ' '.join(['%s,%s' % (i.change.number, i.change.patchset) @@ -213,8 +210,6 @@ class ExecutorClient(object): params['ZUUL_CHANGE_IDS'] = zuul_changes params['ZUUL_CHANGE'] = str(item.change.number) params['ZUUL_PATCHSET'] = str(item.change.patchset) - if hasattr(item.change, 'ref') and item.change.ref is not None: - params['ZUUL_REF'] = item.change.ref params['job'] = job.name params['timeout'] = job.timeout