From eb0223fa7834304bcceaa9e0a43a7f3fb7d68153 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hp.com>
Date: Mon, 2 Jun 2014 22:05:43 +0100
Subject: [PATCH] Add Designate DevStack/Requirements/Docs Jobs

All new jobs are initially non-voting.

Create a new gate-designate-devstack-dsvm job, and apply it
to the check/gate queues of stackforge/designate and
stackforge/python-designateclient

Switch designate and python-designateclient to use the
python-jobs template, which brings in a new gate-{name}-docs
job.

Finally, enable the check-requirements template for designate
and python-designateclient.

Change-Id: I93ae46e3b7fea4a3115b9891d733215964419a38
---
 .../jenkins_job_builder/config/designate.yaml | 36 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  | 36 +++++++++----------
 2 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 modules/openstack_project/files/jenkins_job_builder/config/designate.yaml

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml
new file mode 100644
index 0000000000..cc9123d1a9
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml
@@ -0,0 +1,36 @@
+- job:
+    name: gate-designate-devstack-dsvm
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 65
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export ENABLED_SERVICES=designate,designate-api,designate-central,designate-sink
+          export PROJECTS="stackforge/designate $PROJECTS"
+          export PROJECTS="stackforge/python-designateclient $PROJECTS"
+
+          function pre_test_hook {
+              # Install designate devstack integration
+              DESIGNATE_BASE=/opt/stack/new/designate
+              DEVSTACK_BASE=/opt/stack/new/devstack
+              cp -R $DESIGNATE_BASE/contrib/devstack/* $DEVSTACK_BASE/
+          }
+          export -f pre_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index fbd19d28aa..dec7671c55 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -651,6 +651,16 @@ jobs:
     voting: false
   - name: gate-pecan-tox-barbican-tip
     voting: false
+  - name: gate-designate-devstack-dsvm
+    voting: false
+  - name: gate-designate-requirements
+    voting: false
+  - name: gate-designate-docs
+    voting: false
+  - name: gate-python-designateclient-requirements
+    voting: false
+  - name: gate-python-designateclient-docs
+    voting: false
 
 # The project list is grouped by type of project, and within each
 # group, projects are sorted (mostly) alphabetically.
@@ -3281,19 +3291,14 @@ projects:
 
   - name: stackforge/designate
     template:
+      - name: python-jobs
+      - name: check-requirements
       - name: publish-to-pypi
       - name: docs-on-rtfd
     check:
-      - gate-designate-pep8
-      - gate-designate-python26
-      - gate-designate-python27
+      - gate-designate-devstack-dsvm
     gate:
-      - gate-designate-pep8
-      - gate-designate-python26
-      - gate-designate-python27
-    post:
-      - designate-coverage
-      - designate-branch-tarball
+      - gate-designate-devstack-dsvm
 
   - name: stackforge/designate-specs
     check:
@@ -4098,19 +4103,14 @@ projects:
 
   - name: stackforge/python-designateclient
     template:
+      - name: python-jobs
+      - name: check-requirements
       - name: publish-to-pypi
       - name: docs-on-rtfd
     check:
-      - gate-python-designateclient-pep8
-      - gate-python-designateclient-python26
-      - gate-python-designateclient-python27
+      - gate-designate-devstack-dsvm
     gate:
-      - gate-python-designateclient-pep8
-      - gate-python-designateclient-python26
-      - gate-python-designateclient-python27
-    post:
-      - python-designateclient-coverage
-      - python-designateclient-branch-tarball
+      - gate-designate-devstack-dsvm
 
   - name: stackforge/python-kiteclient
     template: