From 681268db86087d19bc394602a559455dc53081b1 Mon Sep 17 00:00:00 2001
From: Graham Hayes <graham.hayes@hpe.com>
Date: Thu, 25 Aug 2016 18:01:35 +0100
Subject: [PATCH] Add new worker-model job, and remove 2 legacy dvsm jobs

Change-Id: Id66299b667371b396ca51f52149d9834a20a4892
---
 jenkins/jobs/designate.yaml | 5 +++++
 jenkins/jobs/projects.yaml  | 7 +++++++
 zuul/layout.yaml            | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml
index 0a0ba98fa7..54cb465a09 100644
--- a/jenkins/jobs/designate.yaml
+++ b/jenkins/jobs/designate.yaml
@@ -42,6 +42,11 @@
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
           fi
 
+          if [ "{special}" == "-worker-model" ] ; then
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service designate-worker designate-producer"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service designate-pool-manager designate-zone-manager"
+          fi
+
           if [ "{special}" == "-postgres" ] ; then
               export DEVSTACK_GATE_POSTGRES=1
           fi
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 0fffcf486b..45c1b3d3a7 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3357,6 +3357,13 @@
           job-suffix: '-nv'
           designate-driver:
             - powerdns
+      - 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
+          node: ubuntu-trusty
+          branch-override: default
+          special: '-worker-model'
+          job-suffix: '-nv'
+          designate-driver:
+            - powerdns
       - 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}':
           node: ubuntu-trusty
           branch-override: default
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1cb40adfd6..b620a571dc 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1096,6 +1096,7 @@ project-templates:
       - gate-tempest-dsvm-designate-powerdns
       - gate-tempest-dsvm-designate-bind9
       - gate-tempest-dsvm-designate-powerdns-postgres-nv
+      - gate-tempest-dsvm-designate-powerdns-worker-model-nv
       - gate-rally-dsvm-designate-designate
       - gate-grenade-dsvm-designate-powerdns
       - gate-tempest-dsvm-designate-powerdns-identity-v3-only-nv
@@ -2438,6 +2439,14 @@ jobs:
   - name: ^gate-tempest-dsvm-designate-.*$
     branch: ^(?!stable/liberty).*$
 
+  # These are legacy jobs that need to run against liberty and mitaka branches
+  - name: ^gate-designate-dsvm-.*$
+    branch: ^(stable/(liberty|mitaka)).*$
+
+  # This job should only be ran on newton onwards
+  - name: ^gate-tempest-dsvm-designate-.*-worker-model.*$
+    branch: ^(?!stable/(liberty|mitaka)).*$
+
   - name: ^gate-grenade-dsvm-designate-.*$
     branch: ^(?!stable/(liberty|mitaka)).*$