Remove ZUUL_REF
Removing old ZUUL_ env variables which have been replaced with Ansible variables. Change-Id: Iaeac4ac51c518fe4042a1287de16c6fafccc1d6b
This commit is contained in:
parent
b134583070
commit
a438c17037
@ -113,7 +113,7 @@ class TestGithubDriver(ZuulTestCase):
|
|||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
build_params = self.builds[0].parameters
|
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',
|
self.assertEqual('00000000000000000000000000000000',
|
||||||
build_params['zuul']['oldrev'])
|
build_params['zuul']['oldrev'])
|
||||||
self.assertEqual(sha, build_params['zuul']['newrev'])
|
self.assertEqual(sha, build_params['zuul']['newrev'])
|
||||||
@ -137,7 +137,7 @@ class TestGithubDriver(ZuulTestCase):
|
|||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
build_params = self.builds[0].parameters
|
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(old_sha, build_params['zuul']['oldrev'])
|
||||||
self.assertEqual(new_sha, build_params['zuul']['newrev'])
|
self.assertEqual(new_sha, build_params['zuul']['newrev'])
|
||||||
|
|
||||||
|
@ -2033,34 +2033,19 @@ class TestScheduler(ZuulTestCase):
|
|||||||
self.executor_server.release('.*-merge')
|
self.executor_server.release('.*-merge')
|
||||||
self.waitUntilSettled()
|
self.waitUntilSettled()
|
||||||
|
|
||||||
a_zref = b_zref = c_zref = d_zref = None
|
|
||||||
a_build = b_build = c_build = d_build = None
|
a_build = b_build = c_build = d_build = None
|
||||||
for x in self.builds:
|
for x in self.builds:
|
||||||
if x.parameters['ZUUL_CHANGE'] == '3':
|
if x.parameters['ZUUL_CHANGE'] == '3':
|
||||||
a_zref = x.parameters['ZUUL_REF']
|
|
||||||
a_build = x
|
a_build = x
|
||||||
elif x.parameters['ZUUL_CHANGE'] == '4':
|
elif x.parameters['ZUUL_CHANGE'] == '4':
|
||||||
b_zref = x.parameters['ZUUL_REF']
|
|
||||||
b_build = x
|
b_build = x
|
||||||
elif x.parameters['ZUUL_CHANGE'] == '5':
|
elif x.parameters['ZUUL_CHANGE'] == '5':
|
||||||
c_zref = x.parameters['ZUUL_REF']
|
|
||||||
c_build = x
|
c_build = x
|
||||||
elif x.parameters['ZUUL_CHANGE'] == '6':
|
elif x.parameters['ZUUL_CHANGE'] == '6':
|
||||||
d_zref = x.parameters['ZUUL_REF']
|
|
||||||
d_build = x
|
d_build = x
|
||||||
if a_build and b_build and c_build and d_build:
|
if a_build and b_build and c_build and d_build:
|
||||||
break
|
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
|
# should have a, not b, and should not be in project2
|
||||||
self.assertTrue(a_build.hasChanges(A))
|
self.assertTrue(a_build.hasChanges(A))
|
||||||
self.assertFalse(a_build.hasChanges(B, M2))
|
self.assertFalse(a_build.hasChanges(B, M2))
|
||||||
|
@ -203,9 +203,6 @@ class ExecutorClient(object):
|
|||||||
for i in all_items])
|
for i in all_items])
|
||||||
params['ZUUL_BRANCH'] = item.change.branch
|
params['ZUUL_BRANCH'] = item.change.branch
|
||||||
params['ZUUL_CHANGES'] = changes_str
|
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,
|
zuul_changes = ' '.join(['%s,%s' % (i.change.number,
|
||||||
i.change.patchset)
|
i.change.patchset)
|
||||||
@ -213,8 +210,6 @@ class ExecutorClient(object):
|
|||||||
params['ZUUL_CHANGE_IDS'] = zuul_changes
|
params['ZUUL_CHANGE_IDS'] = zuul_changes
|
||||||
params['ZUUL_CHANGE'] = str(item.change.number)
|
params['ZUUL_CHANGE'] = str(item.change.number)
|
||||||
params['ZUUL_PATCHSET'] = str(item.change.patchset)
|
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['job'] = job.name
|
||||||
params['timeout'] = job.timeout
|
params['timeout'] = job.timeout
|
||||||
|
Loading…
Reference in New Issue
Block a user