Run neutron vpnaas jobs on Xenial

This is part of the Trusty to Xenial transition. Will run jobs for
changes against branches >= newton on Xenial. Older branches continue to
run jobs on Trusty.

Change-Id: I93c6b3b332d4764f99367d894e395e738c4dd332
This commit is contained in:
Clark Boylan 2016-12-07 16:39:42 -08:00
parent 4269f6300a
commit c0d469ba4a
3 changed files with 43 additions and 30 deletions

View File

@ -1,5 +1,5 @@
- job-template: - job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}' name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -45,7 +45,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-rally{job-suffix}' name: '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -89,7 +89,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}' name: '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -122,7 +122,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}' name: '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:

View File

@ -8448,31 +8448,35 @@
- 'gate-{name}-releasenotes' - 'gate-{name}-releasenotes'
- 'gate-{name}-python35{suffix}': - 'gate-{name}-python35{suffix}':
suffix: '' suffix: ''
- '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}': - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
vpnaastest: functional - ubuntu-trusty
- ubuntu-xenial
vpnaastest:
- functional
- functional-sswan
job-suffix: '' job-suffix: ''
branch-override: default branch-override: default
- '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}': - '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
vpnaastest: functional-sswan - ubuntu-trusty
- ubuntu-xenial
job-suffix: '' job-suffix: ''
branch-override: default branch-override: default
- '{pipeline}-neutron-vpnaas-dsvm-rally{job-suffix}': - '{pipeline}-neutron-dsvm-tempest-vpnaas-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
- ubuntu-trusty
- ubuntu-xenial
job-suffix: '' job-suffix: ''
branch-override: default branch-override: default
- '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}': - '{pipeline}-neutron-vpnaas-dsvm-api{which}-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
job-suffix: '' - ubuntu-trusty
branch-override: default - ubuntu-xenial
- '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
job-suffix: '-nv' job-suffix: '-nv'
branch-override: default branch-override: default
which: '' which: ''

View File

@ -2002,8 +2002,8 @@ jobs:
- name: gate-novaclient-dsvm-functional-ubuntu-xenial - name: gate-novaclient-dsvm-functional-ubuntu-xenial
branch: ^stable/newton$ branch: ^stable/newton$
- name: gate-neutron-dsvm-tempest-vpnaas - name: gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
branch: ^(?!stable/liberty).*$ branch: ^stable/mitaka$
- name: gate-python-magnumclient-python34 - name: gate-python-magnumclient-python34
branch: ^(?!stable/liberty).*$ branch: ^(?!stable/liberty).*$
@ -12224,8 +12224,10 @@ projects:
- gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial - gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
- gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
- gate-grenade-dsvm-neutron-forward - gate-grenade-dsvm-neutron-forward
- gate-neutron-vpnaas-dsvm-functional - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
- gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
- gate-tempest-dsvm-neutron-full-ssh - gate-tempest-dsvm-neutron-full-ssh
- gate-tempest-dsvm-neutron-ipv6only - gate-tempest-dsvm-neutron-ipv6only
- gate-tempest-dsvm-neutron-serviceipv6 - gate-tempest-dsvm-neutron-serviceipv6
@ -12405,16 +12407,23 @@ projects:
- name: python35-jobs - name: python35-jobs
check: check:
- gate-neutron-vpnaas-releasenotes - gate-neutron-vpnaas-releasenotes
- gate-neutron-vpnaas-dsvm-functional - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
- gate-neutron-vpnaas-dsvm-api-nv - gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
- gate-neutron-vpnaas-dsvm-api-ubuntu-trusty-nv
- gate-neutron-vpnaas-dsvm-api-ubuntu-xenial-nv
gate: gate:
- gate-neutron-vpnaas-releasenotes - gate-neutron-vpnaas-releasenotes
- gate-neutron-vpnaas-dsvm-functional - gate-neutron-vpnaas-dsvm-functional-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan - gate-neutron-vpnaas-dsvm-functional-ubuntu-xenial
- gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-trusty
- gate-neutron-vpnaas-dsvm-functional-sswan-ubuntu-xenial
experimental: experimental:
- gate-neutron-vpnaas-dsvm-rally - gate-neutron-vpnaas-dsvm-rally-ubuntu-trusty
- gate-neutron-dsvm-tempest-vpnaas - gate-neutron-vpnaas-dsvm-rally-ubuntu-xenial
- gate-neutron-dsvm-tempest-vpnaas-ubuntu-trusty
- gate-neutron-dsvm-tempest-vpnaas-ubuntu-xenial
post: post:
- neutron-vpnaas-coverage-ubuntu-trusty - neutron-vpnaas-coverage-ubuntu-trusty
- neutron-vpnaas-coverage-ubuntu-xenial - neutron-vpnaas-coverage-ubuntu-xenial