Merge "Switch ironic-multitenancy job to xenial"

This commit is contained in:
Jenkins 2016-10-19 09:09:41 +00:00 committed by Gerrit Code Review
commit 5ea2def329
4 changed files with 7 additions and 12 deletions

View File

@ -2364,7 +2364,6 @@
- '{pipeline}-tempest-dsvm-ironic-ipa-partition-pxe_ssh-tinyipa{job-suffix}'
- '{pipeline}-tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa{job-suffix}'
- '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}'
- '{pipeline}-tempest-dsvm-ironic-multitenant-network{job-suffix}'
- '{pipeline}-tempest-dsvm-layer4{job-suffix}'
- '{pipeline}-tempest-dsvm-lxc-ubuntu-trusty{job-suffix}'
- '{pipeline}-tempest-dsvm-lvm{job-suffix}'

View File

@ -838,7 +838,7 @@
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-ironic-multitenant-network{job-suffix}'
name: '{pipeline}-tempest-dsvm-ironic-multitenant-network-{node}{job-suffix}'
node: '{node}'
wrappers:

View File

@ -5571,10 +5571,10 @@
job-suffix: '-nv'
branch-override: default
src: ''
- '{pipeline}-tempest-dsvm-ironic-multitenant-network{job-suffix}':
- '{pipeline}-tempest-dsvm-ironic-multitenant-network-{node}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
job-suffix: '-nv'
node: ubuntu-xenial
job-suffix: ''
branch-override: default
- '{pipeline}-grenade-dsvm-ironic{job-suffix}':
pipeline: gate

View File

@ -1978,10 +1978,6 @@ jobs:
- name: ^gate-tempest-dsvm-ironic-pxe_ssh$
branch: ^stable/(liberty|mitaka).*$
# NOTE(sambetts): multitenancy isn't supported in liberty or mitaka
- name: ^gate-tempest-dsvm-ironic-multitenant-network$
branch: ^(?!stable/(liberty|mitaka)).*$
- name: ^gate-ironic-inspector-dsvm-dib$
branch: ^stable/(liberty|mitaka).*$
@ -10241,7 +10237,7 @@ projects:
- gate-tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-nv
- gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-nv
- gate-grenade-dsvm-ironic
- gate-tempest-dsvm-ironic-multitenant-network
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial
- ironic-coverage-db-ubuntu-trusty
- ironic-coverage-db-ubuntu-xenial
gate:
@ -10250,7 +10246,7 @@ projects:
- gate-grenade-dsvm-ironic
- ironic-coverage-db-ubuntu-trusty
- ironic-coverage-db-ubuntu-xenial
- gate-tempest-dsvm-ironic-multitenant-network
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial
post:
- ironic-coverage-db-ubuntu-trusty
- ironic-coverage-db-ubuntu-xenial
@ -12076,7 +12072,7 @@ projects:
- gate-tempest-dsvm-neutron-src-oslo.versionedobjects
- gate-tempest-dsvm-nova-os-vif-nv
- gate-tempest-dsvm-nova-libvirt-kvm-apr
- gate-tempest-dsvm-ironic-multitenant-network-nv
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial
- gate-tempest-dsvm-lvm-multibackend
- gate-tripleo-ci-centos-7-nonha-multinode