Transition nova-docker jobs to Xenial

Ongoing work to transition jobs for changes against branches >= newton
to Xenial. Older branches are not affected.

Change-Id: I64409b21f4ee2e5bfd17f4b9a232e07d391a094a
This commit is contained in:
Clark Boylan 2016-12-08 09:48:24 -08:00
parent 73e10cc3f2
commit 9bc1e34081
3 changed files with 17 additions and 18 deletions

View File

@ -1,6 +1,6 @@
- job: - job-template:
name: gate-tempest-dsvm-docker name: 'gate-tempest-dsvm-docker-{node}-nv'
node: ubuntu-trusty node: '{node}'
wrappers: wrappers:
- build-timeout: - build-timeout:
@ -13,25 +13,25 @@
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
function gate_hook { function gate_hook {{
$BASE/new/nova-docker/contrib/devstack/gate_hook.sh $BASE/new/nova-docker/contrib/devstack/gate_hook.sh
} }}
export -f gate_hook export -f gate_hook
function pre_test_hook { function pre_test_hook {{
if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then
$BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh
fi fi
} }}
export -f pre_test_hook export -f pre_test_hook
function post_test_hook { function post_test_hook {{
if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then
$BASE/new/nova-docker/contrib/devstack/post_test_hook.sh $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh
fi fi
} }}
export -f post_test_hook export -f post_test_hook
@ -46,7 +46,7 @@
- console-log - console-log
- job: - job:
name: gate-tempest-dsvm-docker-centos7 name: gate-tempest-dsvm-docker-centos7-nv
node: centos-7 node: centos-7
wrappers: wrappers:

View File

@ -8593,6 +8593,10 @@
jobs: jobs:
- python-jobs - python-jobs
- 'gate-tempest-dsvm-docker-{node}-nv':
node:
- ubuntu-trusty
- ubuntu-xenial
- project: - project:
name: nova-dpm name: nova-dpm

View File

@ -2852,12 +2852,6 @@ jobs:
- name: gate-blazar-pylint - name: gate-blazar-pylint
voting: false voting: false
- name: gate-tempest-dsvm-docker
voting: false
- name: gate-tempest-dsvm-docker-centos7
voting: false
- name: gate-neutron-dsvm-api-ubuntu-trusty - name: gate-neutron-dsvm-api-ubuntu-trusty
branch: ^(stable/(liberty|mitaka))$ branch: ^(stable/(liberty|mitaka))$
@ -12546,8 +12540,9 @@ projects:
- name: python-jobs - name: python-jobs
- name: check-requirements - name: check-requirements
check: check:
- gate-tempest-dsvm-docker - gate-tempest-dsvm-docker-ubuntu-trusty-nv
- gate-tempest-dsvm-docker-centos7 - gate-tempest-dsvm-docker-ubuntu-xenial-nv
- gate-tempest-dsvm-docker-centos7-nv
- name: openstack/nova-dpm - name: openstack/nova-dpm
template: template: