Merge "Fix implicit role for repos named ansible"

tests/fixtures/config/ansible/git/org_ansible/.zuul.yaml

@@ -0,0 +1,8 @@
+- job:
+    name: hello-ansible
+    run: playbooks/hello-ansible.yaml
+
+- project:
+    check:
+      jobs:
+        - hello-ansible

tests/fixtures/config/ansible/git/org_ansible/README

@@ -0,0 +1 @@
+test

tests/fixtures/config/ansible/git/org_ansible/playbooks/hello-ansible.yaml

@@ -0,0 +1,5 @@
+- hosts: all
+  tasks:
+    - name: hello
+      debug:
+        msg: hello ansible

tests/fixtures/config/ansible/main.yaml

@@ -8,3 +8,4 @@
           - org/project
           - org/plugin-project
           - bare-role
+          - org/ansible

tests/unit/test_v3.py

@@ -2109,6 +2109,17 @@ class TestAnsible(AnsibleZuulTestCase):
             self.assertIn(fail.format("timeout", build_timeout.uuid), msg)
             self.assertIn(fail.format("failpost", build_failpost.uuid), msg)
 
+    def test_repo_ansible(self):
+        A = self.fake_gerrit.addFakeChange('org/ansible', 'master', 'A')
+        self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
+        self.waitUntilSettled()
+
+        self.assertEqual(A.reported, 1,
+                         "A should report success")
+        self.assertHistory([
+            dict(name='hello-ansible', result='SUCCESS', changes='1,1'),
+        ])
+
     def _add_job(self, job_name):
         conf = textwrap.dedent(
             """

zuul/configloader.py

@@ -810,7 +810,7 @@ class JobParser(object):
     def _makeImplicitRole(self, job):
         project = job.source_context.project
         name = project.name.split('/')[-1]
-        name = JobParser.ANSIBLE_ROLE_RE.sub('', name)
+        name = JobParser.ANSIBLE_ROLE_RE.sub('', name) or name
         return model.ZuulRole(name,
                               project.canonical_name,
                               implicit=True)