make postgresql job not use config drive

because we had duplicate looking pg jobs in devstack-gate.yaml
when the file injection behavior was changed back in January it
turns out the nova job to test metadata server was lost (as it
was defined on the pg job that we don't run).

Remove the pg smoke job that's not run to avoid confusion, and set
DEVSTACK_GATE_CONFIGDRIVE=0 on the pg job to get us a metadata
testing environment.

Change-Id: Iff0e3d29f95ab701f1572fea6d8599eade40d181

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -818,39 +818,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-postgres{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 125
-          fail: true
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
     node: '{node}'
@@ -872,6 +839,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_CONFIGDRIVE=0
           export DEVSTACK_GATE_NOVA_API_METADATA_SPLIT=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -1334,7 +1302,6 @@
       - '{pipeline}-tempest-dsvm-large-ops{branch-designator}'
       - '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}'
-      - '{pipeline}-tempest-dsvm-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'