From 8a1e212a06a4cadf752e91f91edb381872bc1a5d Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Thu, 24 Jul 2014 12:06:04 -0400
Subject: [PATCH] build tarballs and docs for barbican

While going through juno-2, I hit a snag for barbican as the tarball
job didn't run.  Update the zuul layout for barbican to match other
parojects for the pre-release and release pipelines.  Also switch to
using the python-jobs template to simplify the barbican config, as
well as include the docs job in the gate.

Change-Id: I0d7294f749112e8f3c67a05cefd7bc3c4901bcb7
---
 .../files/jenkins_job_builder/config/projects.yaml |  2 ++
 modules/openstack_project/files/zuul/layout.yaml   | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 4ec86beebd..68a628ca99 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2344,9 +2344,11 @@
     github-org: openstack
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
 
     jobs:
       - python-jobs
+      - openstack-publish-jobs
       - translation-jobs
 
 - project:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9964a06ae8..18a8351ffc 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -720,19 +720,17 @@ projects:
 
   - name: openstack/barbican
     template:
+      - name: python-jobs
       - name: translation-jobs
+      - name: openstack-server-publish-jobs
     check:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
       - gate-barbican-devstack-dsvm
     gate:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
       - gate-barbican-devstack-dsvm
-    post:
-      - barbican-branch-tarball
+    pre-release:
+      - barbican-tarball
+    release:
+      - barbican-tarball
 
   - name: openstack/barbican-specs
     check: