openstack/project-config
Code Issues Proposed changes

Merge "tripleo: prepare stable/ocata"

Browse Source
This commit is contained in:
Jenkins 2017-01-26 10:47:01 +00:00 committed by Gerrit Code Review
commit e7188ddc01
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gerritbot/channels.yaml
View File

@ -2682,6 +2682,7 @@ tripleo:
- master
- stable/mitaka
- stable/newton
- stable/ocata
wsme:
events:

34
jenkins/jobs/projects.yaml
View File

@ -14053,6 +14053,14 @@
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-ocata'
suffix: ''
type: 'periodic-ovb-ha-ocata'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: stable/ocata
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-newton'
suffix: ''
@ -14356,6 +14364,14 @@
timeout: 180
# tripleo-ci is branchless, so we need to test changes against all the
# stable branches as well.
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-ocata'
suffix: ''
type: 'ovb-nonha'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/ocata'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-newton'
suffix: ''
@ -14380,6 +14396,14 @@
trigger: 'gate'
branch-override: 'stable/mitaka'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-ocata'
suffix: ''
type: 'ovb-ha'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/ocata'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-newton'
suffix: ''
@ -14388,7 +14412,7 @@
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
# Jobs required by Puppet OpenStack CI for stable/mitaka and stable/newton
# Jobs required by Puppet OpenStack CI for stable/mitaka, stable/newton and stable/ocata
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-mitaka'
suffix: ''
@ -14405,6 +14429,14 @@
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-ocata'
suffix: ''
type: 'ovb-nonha'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/ocata'
timeout: 180
- project:
name: tripleo-common

9
zuul/layout.yaml
View File

@ -1682,6 +1682,10 @@ jobs:
- name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton$
branch: ^(stable/newton).*$
# Test TripleO stable/ocata in Puppet OpenStack CI
- name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata$
branch: ^(stable/ocata).*$
# Skip non-doc jobs for doc-only networking-midonet changes. Since
# doc/source/conf.py is checked by networking-midonet-pep8, that job
# should not be skipped.
@ -5082,8 +5086,10 @@ projects:
check-tripleo:
- gate-tripleo-ci-centos-7-ovb-nonha-mitaka
- gate-tripleo-ci-centos-7-ovb-nonha-newton
- gate-tripleo-ci-centos-7-ovb-nonha-ocata
- gate-tripleo-ci-centos-7-ovb-ha-mitaka
- gate-tripleo-ci-centos-7-ovb-ha-newton
- gate-tripleo-ci-centos-7-ovb-ha-ocata
- gate-tripleo-ci-centos-7-ovb-ha-oooq-nv
periodic:
- periodic-tripleo-ci-centos-7-ovb-updates
@ -5093,6 +5099,7 @@ projects:
- periodic-tripleo-ci-centos-7-promote-ovb-nonha
- periodic-tripleo-ci-centos-7-ovb-ha-mitaka
- periodic-tripleo-ci-centos-7-ovb-ha-newton
- periodic-tripleo-ci-centos-7-ovb-ha-ocata
- periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq
- periodic-tripleo-ci-centos-7-scenario001-multinode
- periodic-tripleo-ci-centos-7-scenario002-multinode
@ -14632,6 +14639,7 @@ projects:
check-tripleo:
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-mitaka
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
- name: openstack/puppet-cinder
template:
@ -14652,6 +14660,7 @@ projects:
check-tripleo:
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-mitaka
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
- name: openstack/puppet-cloudkitty
template: