Merge "functional: use vexxhost-specific nodes with nested virt"

This commit is contained in:
Zuul 2018-12-12 00:06:10 +00:00 committed by Gerrit Code Review
commit c8ab4efcbc
1 changed files with 15 additions and 8 deletions

View File

@ -78,8 +78,16 @@
coe: api coe: api
- job: - job:
name: magnum-functional-k8s name: magnum-functional-coe
parent: magnum-functional-base parent: magnum-functional-base
nodeset:
nodes:
- name: primary
label: ubuntu-xenial-vexxhost
- job:
name: magnum-functional-k8s
parent: magnum-functional-coe
voting: false voting: false
vars: vars:
coe: k8s coe: k8s
@ -95,7 +103,7 @@
- job: - job:
name: magnum-functional-swarm-mode name: magnum-functional-swarm-mode
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
branches: ^(?!stable/(newton|ocata)).*$ branches: ^(?!stable/(newton|ocata)).*$
vars: vars:
@ -113,7 +121,7 @@
- job: - job:
name: magnum-functional-dcos name: magnum-functional-dcos
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
branches: ^(?!stable/(newton|ocata)).*$ branches: ^(?!stable/(newton|ocata)).*$
vars: vars:
@ -131,7 +139,7 @@
- job: - job:
name: magnum-functional-mesos name: magnum-functional-mesos
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
vars: vars:
coe: mesos coe: mesos
@ -147,7 +155,7 @@
- job: - job:
name: magnum-functional-swarm name: magnum-functional-swarm
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
vars: vars:
coe: swarm coe: swarm
@ -164,7 +172,7 @@
- job: - job:
name: magnum-functional-k8s-ironic name: magnum-functional-k8s-ironic
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
vars: vars:
coe: k8s coe: k8s
@ -181,7 +189,7 @@
- job: - job:
name: magnum-functional-swarm-ironic name: magnum-functional-swarm-ironic
parent: magnum-functional-base parent: magnum-functional-coe
voting: false voting: false
vars: vars:
coe: swarm coe: swarm
@ -296,4 +304,3 @@
- magnum-dib-buildimage-fedora-atomic-25 - magnum-dib-buildimage-fedora-atomic-25
- magnum-dib-buildimage-ubuntu-mesos - magnum-dib-buildimage-ubuntu-mesos
- magnum-dib-buildimage-centos-dcos - magnum-dib-buildimage-centos-dcos