diff --git a/gerrit/acls/openstack/ansible-role-jenkins-plugins.config b/gerrit/acls/openstack/ansible-role-jenkins-plugins.config new file mode 100644 index 0000000000..0e6eed4740 --- /dev/null +++ b/gerrit/acls/openstack/ansible-role-jenkins-plugins.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group ansible-role-jenkins-plugins-core +label-Code-Review = -2..+2 group ansible-role-jenkins-plugins-core +label-Workflow = -1..+1 group ansible-role-jenkins-plugins-core + +[access "refs/tags/*"] +pushSignedTag = group ansible-role-jenkins-plugins-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/acls/openstack/ansible-role-jenkins.config b/gerrit/acls/openstack/ansible-role-jenkins.config new file mode 100644 index 0000000000..79488772a1 --- /dev/null +++ b/gerrit/acls/openstack/ansible-role-jenkins.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group ansible-role-jenkins-core +label-Code-Review = -2..+2 group ansible-role-jenkins-core +label-Workflow = -1..+1 group ansible-role-jenkins-core + +[access "refs/tags/*"] +pushSignedTag = group ansible-role-jenkins-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index ee4c40f07f..b2853040cf 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -734,8 +734,14 @@ PKI operations - project: openstack/ansible-role-diskimage-builder description: Ansible role to manage diskimage-builder +- project: openstack/ansible-role-jenkins + description: Ansible role to manage Jenkins + upstream: https://github.com/pabelanger/ansible-role-jenkins.git - project: openstack/ansible-role-jenkins-job-builder description: Ansible role to manage Jenkins Job Builder +- project: openstack/ansible-role-jenkins-plugins + description: Ansible role to manage Jenkins plugins + upstream: https://github.com/pabelanger/ansible-role-jenkins-plugins.git - project: openstack/ansible-role-nodepool description: Ansible role to manage Nodepool - project: openstack/ansible-role-zuul diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index ed8ac85aa7..1ef284fb7e 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1769,7 +1769,9 @@ openstack-windmill: - x-vrif-minus-2 projects: - openstack/ansible-role-diskimage-builder + - openstack/ansible-role-jenkins - openstack/ansible-role-jenkins-job-builder + - openstack/ansible-role-jenkins-plugins - openstack/ansible-role-nodepool - openstack/ansible-role-zuul - openstack/windmill diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index e33ffae879..20994e7bd7 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -41,6 +41,15 @@ - ansible-role-jobs - hook-{name}-rtfd +- project: + name: ansible-role-jenkins + node: bare-trusty + tarball-site: tarballs.openstack.org + + jobs: + - ansible-role-jobs + - hook-{name}-rtfd + - project: name: ansible-role-jenkins-job-builder node: bare-trusty @@ -50,6 +59,15 @@ - ansible-role-jobs - hook-{name}-rtfd +- project: + name: ansible-role-jenkins-plugins + node: bare-trusty + tarball-site: tarballs.openstack.org + + jobs: + - ansible-role-jobs + - hook-{name}-rtfd + - project: name: ansible-role-nodepool node: bare-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 82a2e19f50..e718484ee0 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3783,6 +3783,14 @@ projects: - name: ansible-role-functional-jobs-trusty - name: docs-on-rtfd + - name: openstack/ansible-role-jenkins + template: + - name: merge-check + - name: ansible-role-jobs + - name: ansible-role-functional-jobs-centos7-nv + - name: ansible-role-functional-jobs-trusty-nv + - name: docs-on-rtfd + - name: openstack/ansible-role-jenkins-job-builder template: - name: merge-check @@ -3791,6 +3799,14 @@ projects: - name: ansible-role-functional-jobs-trusty - name: docs-on-rtfd + - name: openstack/ansible-role-jenkins-plugins + template: + - name: merge-check + - name: ansible-role-jobs + - name: ansible-role-functional-jobs-centos7-nv + - name: ansible-role-functional-jobs-trusty-nv + - name: docs-on-rtfd + - name: openstack/ansible-role-nodepool template: - name: merge-check