Add new worker-model job, and remove 2 legacy dvsm jobs

Change-Id: Id66299b667371b396ca51f52149d9834a20a4892

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

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

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)).*$