From a09f0e1c1e2fe03bb8daf187e0cec6b990e89d5b Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 2 May 2017 16:25:54 -0400
Subject: [PATCH] Create openstack-zuul-jobs / openstack-zuul-roles projects

As we continue with zuulv3, we are ready to start our first steps
towards writing jobs in ansible. As a result, we need a new
untrusted-project for zuul, which will allow dynamic reconfiguration
of jobs. We do not want to use project-config, as it is consider a
config-project and does not support dynamic reconfiguration.

Change-Id: I8732eba9303dc0748723f919d25d8c5dda3a05ed
Needed-By: Ie277f43a4032da24cccf008e8e3e66cc4c678a08
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../acls/openstack-infra/openstack-zuul-jobs.config | 13 +++++++++++++
 .../openstack-infra/openstack-zuul-roles.config     | 13 +++++++++++++
 gerrit/projects.yaml                                | 10 ++++++++++
 gerritbot/channels.yaml                             |  2 ++
 zuul/layout.yaml                                    | 10 ++++++++++
 zuul/main.yaml                                      |  2 ++
 6 files changed, 50 insertions(+)
 create mode 100644 gerrit/acls/openstack-infra/openstack-zuul-jobs.config
 create mode 100644 gerrit/acls/openstack-infra/openstack-zuul-roles.config

diff --git a/gerrit/acls/openstack-infra/openstack-zuul-jobs.config b/gerrit/acls/openstack-infra/openstack-zuul-jobs.config
new file mode 100644
index 0000000000..9c1ecbe21a
--- /dev/null
+++ b/gerrit/acls/openstack-infra/openstack-zuul-jobs.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group openstack-zuul-jobs-core
+label-Code-Review = -2..+2 group openstack-zuul-jobs-core
+label-Workflow = -1..+1 group openstack-zuul-jobs-core
+
+[access "refs/tags/*"]
+pushSignedTag = group openstack-zuul-jobs-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/acls/openstack-infra/openstack-zuul-roles.config b/gerrit/acls/openstack-infra/openstack-zuul-roles.config
new file mode 100644
index 0000000000..ad18a24243
--- /dev/null
+++ b/gerrit/acls/openstack-infra/openstack-zuul-roles.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group openstack-zuul-roles-core
+label-Code-Review = -2..+2 group openstack-zuul-roles-core
+label-Workflow = -1..+1 group openstack-zuul-roles-core
+
+[access "refs/tags/*"]
+pushSignedTag = group openstack-zuul-roles-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 1da205b132..dc524a7e79 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -251,6 +251,16 @@
 - project: openstack-infra/odsreg
   use-storyboard: true
   description: OpenStack Design Summit session management system
+- project: openstack-infra/openstack-zuul-jobs
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Ansible job definitions for OpenStack projects CI systems
+- project: openstack-infra/openstack-zuul-roles
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  description: Ansible role definitions for OpenStack projects CI systems
 - project: openstack-infra/openstackid
   use-storyboard: true
   description: Authentication system for the OpenStack Foundation site
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 88c13a4f51..44ddd4b27a 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -916,6 +916,8 @@ openstack-infra:
     - openstack-infra/nodepool
     - openstack-infra/nose-html-output
     - openstack-infra/odsreg
+    - openstack-infra/openstack-zuul-jobs
+    - openstack-infra/openstack-zuul-roles
     - openstack-infra/openstackid
     - openstack-infra/openstackid-resources
     - openstack-infra/openstackweb
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d75531b287..39c6cc2302 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4390,6 +4390,16 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  - name: openstack-infra/openstack-zuul-jobs
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
+  - name: openstack-infra/openstack-zuul-roles
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
   - name: openstack-infra/openstackid
     template:
       - name: merge-check
diff --git a/zuul/main.yaml b/zuul/main.yaml
index b13225e427..297ca7332b 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -5,4 +5,6 @@
         config-projects:
           - openstack-infra/project-config
         untrusted-projects:
+          - openstack-infra/openstack-zuul-jobs
+          - openstack-infra/openstack-zuul-roles
           - openstack-infra/zuul