Support multi backends for Zaqar tempest job

Now Zaqar supports mongodb and redis as backends. So it would be
nice if the tempest job can support both.

Change-Id: Ie56471c866ff890988d2ced10253051552c73123
This commit is contained in:
Fei Long Wang
2016-04-21 11:33:35 +12:00
parent 59f8e25bc7
commit 1cd9cdf711
3 changed files with 23 additions and 8 deletions

View File

@@ -9229,6 +9229,18 @@
job-suffix: '' job-suffix: ''
branch-override: default branch-override: default
backend: redis backend: redis
- '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
pipeline: gate
node: ubuntu-trusty
job-suffix: ''
branch-override: default
backend: mongodb
- '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
pipeline: gate
node: ubuntu-trusty
job-suffix: ''
branch-override: default
backend: redis
- project: - project:
name: zaqar-specs name: zaqar-specs

View File

@@ -89,9 +89,9 @@
- devstack-logs - devstack-logs
- console-log - console-log
- job: - job-template:
name: gate-tempest-dsvm-zaqar name: '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}'
node: ubuntu-trusty node: '{node}'
wrappers: wrappers:
- build-timeout: - build-timeout:
@@ -109,10 +109,10 @@
export ENABLED_SERVICES=tempest export ENABLED_SERVICES=tempest
export DEVSTACK_LOCAL_CONFIG="enable_plugin zaqar git://git.openstack.org/openstack/zaqar" export DEVSTACK_LOCAL_CONFIG="enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
function gate_hook { function gate_hook {{
cd /opt/stack/new/zaqar/devstack/gate cd /opt/stack/new/zaqar/devstack/gate
./gate_hook.sh tempest ./gate_hook.sh tempest {backend}
} }}
export -f gate_hook export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

View File

@@ -1291,7 +1291,9 @@ jobs:
- name: gate-zaqar-tox-integration - name: gate-zaqar-tox-integration
voting: false voting: false
- name: gate-tempest-dsvm-zaqar # NOTE(flwang) Make tempest jobs non-voting until Zaqar's tempest
# environment stablizes
- name: ^gate-tempest-dsvm-.*-zaqar$
voting: false voting: false
- name: gate-tempest-dsvm-neutron-nv - name: gate-tempest-dsvm-neutron-nv
@@ -12084,7 +12086,8 @@ projects:
- gate-dsvm-mongodb-zaqar - gate-dsvm-mongodb-zaqar
- gate-dsvm-redis-zaqar - gate-dsvm-redis-zaqar
- gate-rally-dsvm-zaqar-zaqar - gate-rally-dsvm-zaqar-zaqar
- gate-tempest-dsvm-zaqar - gate-tempest-dsvm-mongodb-zaqar
- gate-tempest-dsvm-redis-zaqar
gate: gate:
- gate-dsvm-mongodb-zaqar - gate-dsvm-mongodb-zaqar
- gate-dsvm-redis-zaqar - gate-dsvm-redis-zaqar