openstack/project-config
Code Issues Proposed changes

Enable ubuntu-xenial for Kolla

Browse Source 
* clean up the Kolla jobs
* add the node type to the job name
* add -nv for the none-voting jobs
* enable the ubuntu-xenial on the master branch

Change-Id: Id8e43d7e36f0ecf691fb1abe802823ca6ab84091
This commit is contained in:
Jeffrey Zhang 2016-08-07 22:28:25 +08:00
parent 07e60ff2c9
commit 8023660f28
3 changed files with 44 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/jobs/kolla.yaml
View File

@ -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:

93
jenkins/jobs/projects.yaml
View File

@ -3748,84 +3748,39 @@
node:
- ubuntu-trusty
- 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

80
zuul/layout.yaml
View File

@ -2714,56 +2714,10 @@ jobs:
branch: ^(?!stable/(liberty|mitaka)).*$
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
@ -8232,20 +8186,24 @@ projects:
check:
- gate-kolla-tox-bandit-ubuntu-trusty
- 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: