openstack/project-config
Code Issues Proposed changes

Merge "Replace old OVB ceph jobs by new fs024 job"

Browse Source
This commit is contained in:
Jenkins 2017-07-25 10:00:34 +00:00 committed by Gerrit Code Review
commit cb33e38704
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/jobs/projects.yaml
View File

@ -14804,17 +14804,17 @@
branch-override: 'stable/newton'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-newton'
jobname: 'centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton'
suffix: ''
type: 'ovb-nonha'
type: 'ovb-1ctlr_1comp_1ceph-featureset024'
node: tripleo-centos-7
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-ocata'
jobname: 'centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata'
suffix: ''
type: 'ovb-nonha'
type: 'ovb-1ctlr_1comp_1ceph-featureset024'
node: tripleo-centos-7
trigger: 'gate'
branch-override: 'stable/ocata'

12
zuul/layout.yaml
View File

@ -1832,11 +1832,11 @@ jobs:
branch: ^(?!stable/(newton|ocata)).*$
# Test TripleO stable/newton in Puppet OpenStack CI
- name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton$
- name: ^gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton$
branch: ^(stable/newton).*$
# Test TripleO stable/ocata in Puppet OpenStack CI
- name: ^gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata$
- name: ^gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata$
branch: ^(stable/ocata).*$
# Skip non-doc jobs for doc-only networking-odl changes. Since
@ -14814,8 +14814,8 @@ projects:
- name: tripleo-scenario-jobs-scenario004
- name: puppet-release-jobs
check-tripleo:
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
- gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton
- gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata
- name: openstack/puppet-cinder
template:
@ -14833,8 +14833,8 @@ projects:
- name: tripleo-scenario-jobs-scenario002
- name: puppet-release-jobs
check-tripleo:
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
- gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
- gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-newton
- gate-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-puppet-ocata
- name: openstack/puppet-cloudkitty
template: