From 40b98f9c5d40442d56641417ec47d6d8d6b97032 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 11 Aug 2016 17:00:20 +0200
Subject: [PATCH] designate: Add a non-voting job with postgres as DB backend

Currently designate is not tested with PosgreSQL. Add a non-voting job
to be able to catch the current errors and fix them.
Also remove the not used legacy job called
"gate-designate-dsvm-{designate-driver}-postgres".

Change-Id: I2aab56c1ac817e68d42fa7a444df8243b0ad6e3c
---
 jenkins/jobs/designate.yaml | 77 ++-----------------------------------
 jenkins/jobs/projects.yaml  | 12 +++---
 zuul/layout.yaml            |  5 ++-
 3 files changed, 15 insertions(+), 79 deletions(-)

diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml
index f05f7d383d..9affcb2462 100644
--- a/jenkins/jobs/designate.yaml
+++ b/jenkins/jobs/designate.yaml
@@ -42,6 +42,10 @@
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
           fi
 
+          if [ "{special}" == "-postgres" ] ; then
+              export DEVSTACK_GATE_POSTGRES=1
+          fi
+
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
@@ -214,76 +218,3 @@
     publishers:
       - devstack-logs
       - console-log
-
-
-- job-template:
-    name: 'gate-designate-dsvm-{designate-driver}-postgres'
-
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_DESIGNATE_DRIVER="{designate-driver}"
-          export DEVSTACK_GATE_POSTGRES=1
-          export PROJECTS="openstack/designate $PROJECTS"
-          export PROJECTS="openstack/python-designateclient $PROJECTS"
-          export PROJECTS="openstack/designate-dashboard $PROJECTS"
-
-          if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then
-              # Liberty version uses the older 'hooks' approach to adding
-              # the Designate plugin
-
-              function gate_hook {{
-                  cd /opt/stack/new/designate/contrib/devstack
-                  ./gate_hook.sh
-              }}
-              export -f gate_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 {{
-                  cd /opt/stack/new/designate/contrib/devstack
-                  ./post_test_hook.sh
-              }}
-              export -f post_test_hook
-
-          else
-              # Otherwise, enable the Designate devstack plugin.
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
-
-              function gate_hook {{
-                  cd /opt/stack/new/designate/devstack/gate
-                  ./gate_hook.sh
-              }}
-              export -f gate_hook
-
-              function post_test_hook {{
-                  cd /opt/stack/new/designate/devstack/gate
-                  ./post_test_hook.sh
-              }}
-              export -f post_test_hook
-          fi
-
-          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/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 2da194062e..df9f243ac9 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1501,6 +1501,13 @@
           designate-driver:
             - powerdns
             - bind9
+      - 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
+          node: ubuntu-trusty
+          branch-override: default
+          special: '-postgres'
+          job-suffix: '-nv'
+          designate-driver:
+            - powerdns
       - 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}':
           node: ubuntu-trusty
           branch-override: default
@@ -1521,11 +1528,6 @@
           designate-driver:
             - powerdns
             - bind9
-      # Legacy Job
-      - 'gate-designate-dsvm-{designate-driver}-postgres':
-          node: ubuntu-trusty
-          designate-driver:
-            - powerdns
       - 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
           node: ubuntu-trusty
           special: '-identity-v3-only'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 842ccf7a7f..d9a592b3a9 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1076,6 +1076,7 @@ project-templates:
       - gate-designate-dsvm-bind9
       - gate-tempest-dsvm-designate-powerdns
       - gate-tempest-dsvm-designate-bind9
+      - gate-tempest-dsvm-designate-powerdns-postgres-nv
       - gate-rally-dsvm-designate-designate
       - gate-grenade-dsvm-designate-powerdns
       - gate-tempest-dsvm-designate-powerdns-identity-v3-only-nv
@@ -1087,7 +1088,6 @@ project-templates:
       - gate-tempest-dsvm-designate-bind9
       - gate-grenade-dsvm-designate-powerdns
     experimental:
-      - gate-designate-dsvm-powerdns-postgres
       - gate-tempest-dsvm-designate-agent-knot2
       - gate-tempest-dsvm-designate-agent-djbdns
       - gate-tempest-dsvm-designate-agent-gdnsd
@@ -2265,6 +2265,9 @@ jobs:
   - name: ^gate-tempest-dsvm-designate-.*-mitaka$
     branch: ^master$
 
+  - name: ^gate-tempest-dsvm-designate-.*-postgres-nv$
+    branch: ^(?!stable/(liberty|mitaka)).*$
+
   - name: gate-octavia-tox-bandit-ubuntu-xenial
     branch: master
     voting: false