Merge "Switch to Xenial: gate-neutron-lbaas-dashboard-dsvm-integration"

This commit is contained in:
Jenkins 2016-12-12 18:29:17 +00:00 committed by Gerrit Code Review
commit 67e78c9056
3 changed files with 14 additions and 11 deletions

View File

@ -95,9 +95,9 @@
- devstack-logs
- console-log
- job:
name: gate-neutron-lbaas-dashboard-dsvm-integration
node: ubuntu-trusty
- job-template:
name: gate-neutron-lbaas-dashboard-dsvm-integration-{node}{suffix}
node: '{node}'
wrappers:
- build-timeout:
@ -120,14 +120,14 @@
export PROJECTS="openstack/neutron-lbaas-dashboard $PROJECTS"
function pre_test_hook {
function pre_test_hook {{
$BASE/new/neutron-lbaas-dashboard/tools/gate/integration/pre_test_hook.sh
}
}}
export -f pre_test_hook
function post_test_hook {
function post_test_hook {{
$BASE/new/neutron-lbaas-dashboard/tools/gate/integration/post_test_hook.sh
}
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

View File

@ -8469,6 +8469,11 @@
- nodejs4-jobs
- pypi-jobs
- translation-jobs
- gate-neutron-lbaas-dashboard-dsvm-integration-{node}{suffix}:
node:
- ubuntu-trusty
- ubuntu-xenial
suffix: '-nv'
- project:
name: neutron-lib

View File

@ -2624,9 +2624,6 @@ jobs:
- name: gate-sahara-dashboard-python34
branch: ^(?!stable/(mitaka)).*$
- name: gate-neutron-lbaas-dashboard-dsvm-integration
voting: false
- name: ^gate-sahara-tests-pylint.*
voting: false
@ -12480,7 +12477,8 @@ projects:
check:
- gate-neutron-lbaas-dashboard-nodejs4-npm-run-lint
- gate-neutron-lbaas-dashboard-nodejs4-npm-run-test
- gate-neutron-lbaas-dashboard-dsvm-integration
- gate-neutron-lbaas-dashboard-dsvm-integration-ubuntu-trusty-nv
- gate-neutron-lbaas-dashboard-dsvm-integration-ubuntu-xenial-nv
- name: openstack/neutron-lib
template: