From 846437fe705abf0825d61686e219caaa250e4de1 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 28 Jun 2016 10:33:43 +0100
Subject: [PATCH] Add repositories for Charm layers

Create repositories and perform initial import of a number
of Charm layer modules associated with the OpenStack Charm
set.

Layers will support two tox targets - pep8 (for linting the
layer) and build (for building out the layer with associated
dependencies).

Change-Id: I53ad2cd7f01e77f6123d9ce3a5eed14b5574e752
---
 gerrit/projects.yaml         | 12 ++++++++++++
 jenkins/jobs/charm-jobs.yaml |  6 ++++++
 jenkins/jobs/projects.yaml   | 21 +++++++++++++++++++++
 zuul/layout.yaml             | 23 +++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 jenkins/jobs/charm-jobs.yaml

diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 47ad71a937..284f91165e 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -998,6 +998,18 @@
     - keystone (Juju Charms Collection)
   options:
     - delay-release
+- project: openstack/charm-layer-openstack
+  description: Charm Layer - OpenStack base layer
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/openstack-charmers/charm-layer-openstack
+- project: openstack/charm-layer-openstack-api
+  description: Charm Layer - OpenStack API layer
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/openstack-charmers/charm-layer-openstack-api
+- project: openstack/charm-layer-openstack-principle
+  description: Charm Layer - OpenStack principle charm layer
+  acl-config: /home/gerrit2/acls/openstack/charm.config
+  upstream: https://github.com/openstack-charmers/charm-layer-openstack-principle
 - project: openstack/charm-lxd
   description: Juju Charm - LXD
   acl-config: /home/gerrit2/acls/openstack/charm.config
diff --git a/jenkins/jobs/charm-jobs.yaml b/jenkins/jobs/charm-jobs.yaml
new file mode 100644
index 0000000000..6f251de57d
--- /dev/null
+++ b/jenkins/jobs/charm-jobs.yaml
@@ -0,0 +1,6 @@
+- job-group:
+    name: charm-layer-jobs
+    jobs:
+      - 'gate-{name}-pep8'
+      - gate-{name}-tox-{envlist}:
+          envlist: charm-build
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 51710bc988..1840f040e2 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -669,6 +669,27 @@
     jobs:
       - python-jobs
 
+- project:
+    name: charm-layer-openstack
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - charm-layer-jobs
+
+- project:
+    name: charm-layer-openstack-api
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - charm-layer-jobs
+
+- project:
+    name: charm-layer-openstack-principle
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - charm-layer-jobs
+
 - project:
     name: charm-lxd
     tarball-site: tarballs.openstack.org
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index db5e8b2a35..0662d7a6dd 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -375,6 +375,14 @@ project-templates:
     post:
       - '{name}-branch-tarball'
 
+  - name: python-charm-layer-jobs
+    check:
+      - 'gate-{name}-pep8'
+      - 'gate-{name}-tox-charm-build'
+    gate:
+      - 'gate-{name}-pep8'
+      - 'gate-{name}-tox-charm-build'
+
   - name: periodic-jobs-with-oslo-master
     periodic:
       - 'periodic-{name}-py27-with-oslo-master'
@@ -4952,6 +4960,21 @@ projects:
       - name: merge-check
       - name: python-charm-jobs
 
+  - name: openstack/charm-layer-openstack
+    template:
+      - name: merge-check
+      - name: python-charm-layer-jobs
+
+  - name: openstack/charm-layer-openstack-api
+    template:
+      - name: merge-check
+      - name: python-charm-layer-jobs
+
+  - name: openstack/charm-layer-openstack-principle
+    template:
+      - name: merge-check
+      - name: python-charm-layer-jobs
+
   - name: openstack/charm-lxd
     template:
       - name: merge-check