Merge "make postgresql job not use config drive"

This commit is contained in:
Jenkins 2014-04-15 09:09:47 +00:00 committed by Gerrit Code Review
commit 60ba638db5

View File

@ -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}'