openstack/project-config
Code Issues Proposed changes

Merge "Enable ubuntu-xenial for Kolla"

Browse Source
This commit is contained in:
Jenkins 2016-08-11 18:00:13 +00:00 committed by Gerrit Code Review
commit 7742abdb6c
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: - job-template:
name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}' name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:

93
jenkins/jobs/projects.yaml
View File

@ -3766,84 +3766,39 @@
envlist: bandit envlist: bandit
node: node:
- ubuntu-xenial - ubuntu-xenial
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
action: build action:
distro: centos - build
- deploy
distro:
- centos
- oraclelinux
node: 'centos-7' node: 'centos-7'
pipeline: gate pipeline: gate
type: binary type:
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': - binary
action: deploy - source
distro: centos job-suffix: '-nv'
node: 'centos-7' - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
pipeline: gate action:
type: binary - build
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': - deploy
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
distro: ubuntu distro: ubuntu
node: ubuntu-trusty node:
- ubuntu-trusty
- ubuntu-xenial
pipeline: gate pipeline: gate
type: binary type:
- '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': - binary
action: build - source
distro: ubuntu job-suffix: "-nv"
node: ubuntu-trusty - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{job-suffix}':
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}':
action: deploy-multinode action: deploy-multinode
distro: ubuntu distro: ubuntu
node: 'ubuntu-trusty-2-node' node: 'ubuntu-trusty-2-node'
pipeline: gate pipeline: gate
type: source type: source
job-suffix: "-nv"
- project: - project:
name: kolla-kubernetes name: kolla-kubernetes

80
zuul/layout.yaml
View File

@ -2700,56 +2700,10 @@ jobs:
- name: ^gate-kolla-tox-bandit-ubuntu-xenial$ - name: ^gate-kolla-tox-bandit-ubuntu-xenial$
voting: false 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 # Ubuntu has no master branch packaging for OpenStack projects, so just run
# this job on stable/liberty and stable/mitaka branch # this job on stable/liberty and stable/mitaka branch
- name: gate-kolla-dsvm-build-ubuntu-binary - name: ^gate-kolla-dsvm-(build|deploy)-ubuntu-binary.*$
voting: false branch: ^stable/(liberty|mitaka).*$
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-)?devstack-docs - name: ^(gate-)?devstack-docs
branch: ^master branch: ^master
@ -8254,20 +8208,24 @@ projects:
- name: release-notes-jobs - name: release-notes-jobs
check: check:
- gate-kolla-tox-bandit-ubuntu-xenial - gate-kolla-tox-bandit-ubuntu-xenial
- gate-kolla-dsvm-build-centos-binary - gate-kolla-dsvm-build-centos-binary-centos-7-nv
- gate-kolla-dsvm-deploy-centos-binary - gate-kolla-dsvm-deploy-centos-binary-centos-7-nv
- gate-kolla-dsvm-build-centos-source - gate-kolla-dsvm-build-centos-source-centos-7-nv
- gate-kolla-dsvm-deploy-centos-source - gate-kolla-dsvm-deploy-centos-source-centos-7-nv
- gate-kolla-dsvm-build-ubuntu-binary - gate-kolla-dsvm-build-ubuntu-binary-ubuntu-trusty-nv
- gate-kolla-dsvm-build-ubuntu-source - gate-kolla-dsvm-build-ubuntu-source-ubuntu-trusty-nv
- gate-kolla-dsvm-deploy-ubuntu-binary - gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-trusty-nv
- gate-kolla-dsvm-deploy-ubuntu-source - gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-trusty-nv
- gate-kolla-dsvm-build-oraclelinux-binary - gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv
- gate-kolla-dsvm-deploy-oraclelinux-binary - gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial-nv
- gate-kolla-dsvm-build-oraclelinux-source - gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv
- gate-kolla-dsvm-deploy-oraclelinux-source - 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: experimental:
- gate-kolla-dsvm-deploy-multinode-ubuntu-source - gate-kolla-dsvm-deploy-multinode-ubuntu-source-ubuntu-trusty-2-node-nv
- name: openstack/kolla-kubernetes - name: openstack/kolla-kubernetes
template: template: