zuul
/
zuul
Code Issues Proposed changes

Revert "Make job registration with labels optional" 

This reverts commit aad4917fce.

We ended up not using this.

Change-Id: I17d37627528ece1880d05e372099e9d1158e1fec
This commit is contained in:
James E. Blair 2016-07-20 09:51:27 -07:00
parent bc58ea3412
commit bb2e9dbcfb
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zuul/launcher/ansiblelaunchserver.py
View File

@ -596,11 +596,6 @@ class NodeWorker(object):
self.username = config.get('launcher', 'username')
else:
self.username = 'zuul'
if self.config.has_option('launcher', 'register_labels'):
self.register_labels = config.getboolean('launcher',
'register_labels')
else:
self.register_labels = True
self.callback_dir = callback_dir
self.library_dir = library_dir
self.options = options
@ -740,9 +735,8 @@ class NodeWorker(object):
if not matching_labels:
return ret
ret.add('build:%s' % (job['name'],))
if self.register_labels:
for label in matching_labels:
ret.add('build:%s:%s' % (job['name'], label))
for label in matching_labels:
ret.add('build:%s:%s' % (job['name'], label))
return ret
def register(self):