Zun: switch from "job" to "job-template"

This allows us to add another pipeline in the future by using the
same template.

Change-Id: I1b74acc74210401a098cb39e3c85b1405021c920
This commit is contained in:
Hongbin Lu 2016-12-01 15:07:18 -06:00
parent f3b3955a21
commit 420941bdf9
3 changed files with 17 additions and 12 deletions

View File

@ -16001,6 +16001,11 @@
- python-jobs
- 'gate-{name}-python35{suffix}':
suffix: '-nv'
- '{pipeline}-zun-devstack-dsvm-{driver}':
pipeline: gate
node: ubuntu-xenial
driver: 'docker'
branch-override: default
- project:
name: zun-ui

View File

@ -1,6 +1,6 @@
- job:
name: 'gate-zun-devstack-dsvm'
node: ubuntu-xenial
- job-template:
name: '{pipeline}-zun-devstack-dsvm-{driver}'
node: '{node}'
wrappers:
- build-timeout:
@ -28,17 +28,17 @@
# Keep localrc to be able to set some vars in post_test_hook
export KEEP_LOCALRC=1
function gate_hook {
function gate_hook {{
cd /opt/stack/new/zun/
./devstack/gate_hook.sh
}
./devstack/gate_hook.sh {driver}
}}
export -f gate_hook
function post_test_hook {
function post_test_hook {{
source $BASE/new/devstack/accrc/admin/admin
cd /opt/stack/new/zun/
./zun/tests/contrib/post_test_hook.sh
}
./zun/tests/contrib/post_test_hook.sh {driver}
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

View File

@ -2033,7 +2033,7 @@ jobs:
- ^magnum/drivers/k8s.*$
- ^magnum/drivers/swarm.*$
- name: gate-zun-devstack-dsvm
- name: ^gate-zun-devstack-dsvm.*
skip-if:
- project: ^openstack/zun$
all-files-match-any:
@ -18233,9 +18233,9 @@ projects:
- name: python35-jobs-nv
- name: check-requirements
check:
- gate-zun-devstack-dsvm
- gate-zun-devstack-dsvm-docker
gate:
- gate-zun-devstack-dsvm
- gate-zun-devstack-dsvm-docker
- name: openstack/zun-ui
template: