From beabaf96d51702af7649baf1b1c6845dd4b65b0d Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hp.com>
Date: Thu, 27 Nov 2014 03:51:24 +0000
Subject: [PATCH] Add Designate BIND9 DSVM Job

Refactor the gate-designate-devstack-dsvm job to be a reusable
job template, turning it into gate-designate-dsvm-powerdns, and
create a second instance for the BIND9 designate driver.

Change-Id: I7c5321e82caf8d54cf74095cea18dd1ea5b5bac5
---
 jenkins/jobs/designate.yaml | 21 +++++++++++----------
 jenkins/jobs/projects.yaml  |  5 +++++
 zuul/layout.yaml            | 14 +++++++++-----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml
index 78be093b1b..874d270ddd 100644
--- a/jenkins/jobs/designate.yaml
+++ b/jenkins/jobs/designate.yaml
@@ -1,6 +1,7 @@
-- job:
-    name: gate-designate-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+- job-template:
+    name: 'gate-designate-dsvm-{designate-driver}'
+
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -15,26 +16,26 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
-          export ENABLED_SERVICES=designate,designate-api,designate-central,designate-sink
+          export DEVSTACK_GATE_DESIGNATE_DRIVER="{designate-driver}"
           export PROJECTS="openstack/designate $PROJECTS"
           export PROJECTS="openstack/python-designateclient $PROJECTS"
 
-          function gate_hook {
+          function gate_hook {{
               cd /opt/stack/new/designate/contrib/devstack
               ./gate_hook.sh
-          }
+          }}
           export -f gate_hook
 
-          function pre_test_hook {
+          function pre_test_hook {{
               cd /opt/stack/new/designate/contrib/devstack
               ./pre_test_hook.sh
-          }
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               cd /opt/stack/new/designate/contrib/devstack
               ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 55e88434dd..6b90fe3499 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -104,6 +104,11 @@
       - pypi-jobs
       - translation-jobs
       - rally-jobs
+      - 'gate-designate-dsvm-{designate-driver}':
+          node: 'devstack-precise || devstack-trusty'
+          designate-driver:
+            - powerdns
+            - bind9
 
 - project:
     name: designate-specs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0d1461ab92..52dda1c9ad 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -584,8 +584,10 @@ jobs:
     voting: false
   - name: check-tempest-dsvm-neutron-aiopcpu
     voting: false
-  - name: gate-designate-devstack-dsvm
+  - name: ^gate-designate-dsvm-.*$
     branch: ^(?!stable/icehouse).*$
+  - name: gate-designate-dsvm-bind9
+    branch: ^(?!stable/(?:icehouse|juno)).*$
 # For Gerrit ver 2.4.x (using maven)
   - name: ^(gate|check)-gerrit-unittests$
     branch: ^openstack/2\.4.*$
@@ -1003,10 +1005,12 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
     check:
-      - gate-designate-devstack-dsvm
+      - gate-designate-dsvm-powerdns
+      - gate-designate-dsvm-bind9
       - gate-rally-dsvm-designate-designate
     gate:
-      - gate-designate-devstack-dsvm
+      - gate-designate-dsvm-powerdns
+      - gate-designate-dsvm-bind9
     post:
       - designate-coverage
 
@@ -1592,9 +1596,9 @@ projects:
       - name: publish-to-pypi
       - name: lib-forward-testing
     check:
-      - gate-designate-devstack-dsvm
+      - gate-designate-dsvm-powerdns
     gate:
-      - gate-designate-devstack-dsvm
+      - gate-designate-dsvm-powerdns
     post:
       - python-designateclient-coverage