Merge "Enable ubuntu-xenial for Kolla"
This commit is contained in:
commit
7742abdb6c
@ -1,5 +1,5 @@
|
||||
- job-template:
|
||||
name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}'
|
||||
name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
@ -3766,84 +3766,39 @@
|
||||
envlist: bandit
|
||||
node:
|
||||
- ubuntu-xenial
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
distro: centos
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
|
||||
action:
|
||||
- build
|
||||
- deploy
|
||||
distro:
|
||||
- centos
|
||||
- oraclelinux
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: centos
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
distro: centos
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: centos
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
type:
|
||||
- binary
|
||||
- source
|
||||
job-suffix: '-nv'
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
|
||||
action:
|
||||
- build
|
||||
- deploy
|
||||
distro: ubuntu
|
||||
node: ubuntu-trusty
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
distro: ubuntu
|
||||
node: ubuntu-trusty
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: ubuntu
|
||||
node: ubuntu-trusty
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: ubuntu
|
||||
node: ubuntu-trusty
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
distro: oraclelinux
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: oraclelinux
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: binary
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: build
|
||||
distro: oraclelinux
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
action: deploy
|
||||
distro: oraclelinux
|
||||
node: 'centos-7'
|
||||
pipeline: gate
|
||||
type: source
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
|
||||
type:
|
||||
- binary
|
||||
- source
|
||||
job-suffix: "-nv"
|
||||
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
|
||||
action: deploy-multinode
|
||||
distro: ubuntu
|
||||
node: 'ubuntu-trusty-2-node'
|
||||
pipeline: gate
|
||||
type: source
|
||||
job-suffix: "-nv"
|
||||
|
||||
- project:
|
||||
name: kolla-kubernetes
|
||||
|
@ -2700,56 +2700,10 @@ jobs:
|
||||
- name: ^gate-kolla-tox-bandit-ubuntu-xenial$
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-build-centos-binary
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-deploy-centos-binary
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-build-centos-source
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-deploy-centos-source
|
||||
voting: false
|
||||
|
||||
# Ubuntu has no master branch packaging for OpenStack projects, so just run
|
||||
# this job on stable/liberty and stable/mitaka branch
|
||||
- name: gate-kolla-dsvm-build-ubuntu-binary
|
||||
voting: false
|
||||
branch: ^stable/(liberty|mitaka)
|
||||
|
||||
- name: gate-kolla-dsvm-build-ubuntu-source
|
||||
voting: false
|
||||
|
||||
# Ubuntu has no master branch packaging for OpenStack projects, so just run
|
||||
# this job on stable/liberty and stable/mitaka branch
|
||||
- name: gate-kolla-dsvm-deploy-ubuntu-binary
|
||||
voting: false
|
||||
branch: ^stable/(liberty|mitaka)
|
||||
|
||||
- name: gate-kolla-dsvm-deploy-ubuntu-source
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-build-oraclelinux-binary
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-deploy-oraclelinux-binary
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-build-oraclelinux-source
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-dsvm-deploy-oraclelinux-source
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-kubernetes-deploy-centos-binary
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-kubernetes-deploy-centos-source
|
||||
voting: false
|
||||
|
||||
- name: gate-kolla-kubernetes-deploy-ubuntu-source
|
||||
voting: false
|
||||
- name: ^gate-kolla-dsvm-(build|deploy)-ubuntu-binary.*$
|
||||
branch: ^stable/(liberty|mitaka).*$
|
||||
|
||||
- name: ^(gate-)?devstack-docs
|
||||
branch: ^master
|
||||
@ -8254,20 +8208,24 @@ projects:
|
||||
- name: release-notes-jobs
|
||||
check:
|
||||
- gate-kolla-tox-bandit-ubuntu-xenial
|
||||
- gate-kolla-dsvm-build-centos-binary
|
||||
- gate-kolla-dsvm-deploy-centos-binary
|
||||
- gate-kolla-dsvm-build-centos-source
|
||||
- gate-kolla-dsvm-deploy-centos-source
|
||||
- gate-kolla-dsvm-build-ubuntu-binary
|
||||
- gate-kolla-dsvm-build-ubuntu-source
|
||||
- gate-kolla-dsvm-deploy-ubuntu-binary
|
||||
- gate-kolla-dsvm-deploy-ubuntu-source
|
||||
- gate-kolla-dsvm-build-oraclelinux-binary
|
||||
- gate-kolla-dsvm-deploy-oraclelinux-binary
|
||||
- gate-kolla-dsvm-build-oraclelinux-source
|
||||
- gate-kolla-dsvm-deploy-oraclelinux-source
|
||||
- gate-kolla-dsvm-build-centos-binary-centos-7-nv
|
||||
- gate-kolla-dsvm-deploy-centos-binary-centos-7-nv
|
||||
- gate-kolla-dsvm-build-centos-source-centos-7-nv
|
||||
- gate-kolla-dsvm-deploy-centos-source-centos-7-nv
|
||||
- gate-kolla-dsvm-build-ubuntu-binary-ubuntu-trusty-nv
|
||||
- gate-kolla-dsvm-build-ubuntu-source-ubuntu-trusty-nv
|
||||
- gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-trusty-nv
|
||||
- gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-trusty-nv
|
||||
- gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv
|
||||
- gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial-nv
|
||||
- gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv
|
||||
- gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv
|
||||
- gate-kolla-dsvm-build-oraclelinux-binary-centos-7-nv
|
||||
- gate-kolla-dsvm-deploy-oraclelinux-binary-centos-7-nv
|
||||
- gate-kolla-dsvm-build-oraclelinux-source-centos-7-nv
|
||||
- gate-kolla-dsvm-deploy-oraclelinux-source-centos-7-nv
|
||||
experimental:
|
||||
- gate-kolla-dsvm-deploy-multinode-ubuntu-source
|
||||
- gate-kolla-dsvm-deploy-multinode-ubuntu-source-ubuntu-trusty-2-node-nv
|
||||
|
||||
- name: openstack/kolla-kubernetes
|
||||
template:
|
||||
|
Loading…
Reference in New Issue
Block a user