Merge "Remove ansible-role from implied role names" into feature/zuulv3
This commit is contained in:
commit
3cc96087e9
|
@ -17,6 +17,7 @@ import os
|
||||||
import logging
|
import logging
|
||||||
import textwrap
|
import textwrap
|
||||||
import io
|
import io
|
||||||
|
import re
|
||||||
|
|
||||||
import voluptuous as vs
|
import voluptuous as vs
|
||||||
|
|
||||||
|
@ -300,6 +301,8 @@ class SecretParser(object):
|
||||||
|
|
||||||
|
|
||||||
class JobParser(object):
|
class JobParser(object):
|
||||||
|
ANSIBLE_ROLE_RE = re.compile(r'^(ansible[-_.+]*)*(role[-_.+]*)*')
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def getSchema():
|
def getSchema():
|
||||||
auth = {'secrets': to_list(str),
|
auth = {'secrets': to_list(str),
|
||||||
|
@ -563,6 +566,7 @@ class JobParser(object):
|
||||||
def _makeImplicitRole(job):
|
def _makeImplicitRole(job):
|
||||||
project = job.source_context.project
|
project = job.source_context.project
|
||||||
name = project.name.split('/')[-1]
|
name = project.name.split('/')[-1]
|
||||||
|
name = JobParser.ANSIBLE_ROLE_RE.sub('', name)
|
||||||
return model.ZuulRole(name,
|
return model.ZuulRole(name,
|
||||||
project.connection_name,
|
project.connection_name,
|
||||||
project.name,
|
project.name,
|
||||||
|
|
Loading…
Reference in New Issue