Merge "Revert "Make job registration with labels optional""
diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/ansiblelaunchserver.py
index ea0aa4e..975a842 100644
--- a/zuul/launcher/ansiblelaunchserver.py
+++ b/zuul/launcher/ansiblelaunchserver.py
@@ -601,11 +601,6 @@
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
@@ -745,9 +740,8 @@
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):