Merge "Add Designate BIND9 DSVM Job"

jenkins/jobs/designate.yaml

@@ -1,6 +1,7 @@
-- job:
+- job-template:
-    name: gate-designate-devstack-dsvm
+    name: 'gate-designate-dsvm-{designate-driver}'
-    node: 'devstack-precise || devstack-trusty'
+
+    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

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

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