commit 3cc96087e9b7a8b6ca64ba86d372bced1d96b75f
author Jenkins <jenkins@review.openstack.org> Wed Jul 19 23:32:57 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 19 23:32:57 2017 +0000
tree cd08e796fb6bdf046610535a6aafb8442f4718a8
parent ade95e297054b2c46979b2bae78ad1afc79880e7
parent 967b84d42b169ca2defed7399332b8143c3a7a0b

Merge "Remove ansible-role from implied role names" into feature/zuulv3

zuul/configloader.py

diff --git a/zuul/configloader.py b/zuul/configloader.py
index 58f3cad..7640dfc 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -17,6 +17,7 @@
 import logging
 import textwrap
 import io
+import re
 
 import voluptuous as vs
 
@@ -300,6 +301,8 @@
 
 
 class JobParser(object):
+    ANSIBLE_ROLE_RE = re.compile(r'^(ansible[-_.+]*)*(role[-_.+]*)*')
+
     @staticmethod
     def getSchema():
         auth = {'secrets': to_list(str),
@@ -563,6 +566,7 @@
     def _makeImplicitRole(job):
         project = job.source_context.project
         name = project.name.split('/')[-1]
+        name = JobParser.ANSIBLE_ROLE_RE.sub('', name)
         return model.ZuulRole(name,
                               project.connection_name,
                               project.name,