Merge "Revert "Revert "Migrate tripleo to centos-7"""
This commit is contained in:
Jenkins
Gerrit Code Review
commit
ca0dd6180a
@ -9242,36 +9242,18 @@
|
||||
tarball-site: tarballs.openstack.org
|
||||
|
||||
jobs:
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-nonha'
|
||||
type: 'nonha'
|
||||
node: 'tripleo-f22'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'centos-7-nonha'
|
||||
type: 'nonha'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha'
|
||||
type: 'ha'
|
||||
node: 'tripleo-f22'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'centos-7-ha'
|
||||
type: 'ha'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-upgrades'
|
||||
type: 'upgrades'
|
||||
node: 'tripleo-f22'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'centos-7-upgrades'
|
||||
type: 'upgrades'
|
||||
@ -9279,54 +9261,48 @@
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-nonha'
|
||||
jobname: 'centos-7-nonha'
|
||||
type: 'periodic-nonha'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha'
|
||||
jobname: 'centos-7-ha'
|
||||
type: 'periodic-ha'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-upgrades'
|
||||
jobname: 'centos-7-upgrades'
|
||||
type: 'periodic-upgrades'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha-liberty'
|
||||
jobname: 'centos-7-ha-liberty'
|
||||
type: 'periodic-ha-liberty'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: stable/liberty
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha-mitaka'
|
||||
jobname: 'centos-7-ha-mitaka'
|
||||
type: 'periodic-ha-mitaka'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: stable/mitaka
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha-tempest'
|
||||
jobname: 'centos-7-ha-tempest'
|
||||
type: 'ha-tempest'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'periodic'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-ha-tempest'
|
||||
jobname: 'centos-7-ha-tempest'
|
||||
type: 'ha-tempest'
|
||||
node: 'tripleo-f22'
|
||||
node: 'tripleo-centos-7'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
# Experimental jobs for testing containers
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'f22-containers'
|
||||
type: 'containers'
|
||||
node: 'tripleo-f22'
|
||||
trigger: 'gate'
|
||||
branch-override: default
|
||||
- '{trigger}-tripleo-ci-{jobname}':
|
||||
jobname: 'centos-7-containers'
|
||||
type: 'containers'
|
||||
|
||||
@ -864,20 +864,16 @@ project-templates:
|
||||
|
||||
- name: check-tripleo-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-upgrades
|
||||
- gate-tripleo-ci-f22-ha
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
experimental-tripleo:
|
||||
- gate-tripleo-ci-centos-7-upgrades
|
||||
- gate-tripleo-ci-centos-7-ha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
experimental-tripleo:
|
||||
- gate-tripleo-ci-centos-7-containers
|
||||
- gate-tripleo-ci-f22-containers
|
||||
- gate-tripleo-ci-f22-ha-tempest
|
||||
- gate-tripleo-ci-centos-7-ha-tempest
|
||||
|
||||
- name: experimental-tripleo-jobs
|
||||
experimental-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: salt-formula-jobs
|
||||
check:
|
||||
@ -1299,7 +1295,7 @@ jobs:
|
||||
branch: ^(?!stable/(kilo|liberty)).*$
|
||||
|
||||
# no need to run the jobs for doc / releasenotes / unittests patches
|
||||
- name: ^gate-(puppet-.*-(syntax|unit|beaker|tempest)-|tripleo-ci-f22-).*$
|
||||
- name: ^gate-(puppet-.*-(syntax|unit|beaker|tempest)-|tripleo-ci-centos-7-).*$
|
||||
skip-if:
|
||||
- project: ^openstack/puppet-.*$
|
||||
all-files-match-any:
|
||||
@ -1815,7 +1811,7 @@ jobs:
|
||||
- name: gate-ironicclient-dsvm-functional
|
||||
voting: false
|
||||
|
||||
- name: gate-tripleo-ci-f22-containers
|
||||
- name: gate-tripleo-ci-centos-7-containers
|
||||
voting: false
|
||||
|
||||
- name: ^gate-.*-tox-doc-publish-checkbuild$
|
||||
@ -4279,12 +4275,12 @@ projects:
|
||||
- name: noop-jobs
|
||||
- name: check-tripleo-jobs
|
||||
periodic:
|
||||
- periodic-tripleo-ci-f22-upgrades
|
||||
- periodic-tripleo-ci-f22-ha
|
||||
- periodic-tripleo-ci-f22-nonha
|
||||
- periodic-tripleo-ci-f22-ha-liberty
|
||||
- periodic-tripleo-ci-f22-ha-mitaka
|
||||
- periodic-tripleo-ci-f22-ha-tempest
|
||||
- periodic-tripleo-ci-centos-7-upgrades
|
||||
- periodic-tripleo-ci-centos-7-ha
|
||||
- periodic-tripleo-ci-centos-7-nonha
|
||||
- periodic-tripleo-ci-centos-7-ha-liberty
|
||||
- periodic-tripleo-ci-centos-7-ha-mitaka
|
||||
- periodic-tripleo-ci-centos-7-ha-tempest
|
||||
|
||||
- name: openstack-infra/trystack-site
|
||||
template:
|
||||
@ -5648,7 +5644,7 @@ projects:
|
||||
- gate-dib-dsvm-functests-centos-7
|
||||
- gate-dib-utils-tox-func
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
gate:
|
||||
- gate-dib-dsvm-functests-ubuntu-trusty
|
||||
- gate-dib-dsvm-functests-centos-7
|
||||
@ -5671,7 +5667,7 @@ projects:
|
||||
- gate-dib-dsvm-functests-ubuntu-trusty-extras-nv
|
||||
- gate-dib-dsvm-functests-centos-7-extras-nv
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
gate:
|
||||
- gate-dib-dsvm-functests-ubuntu-trusty
|
||||
- gate-dib-dsvm-functests-centos-7
|
||||
@ -9609,7 +9605,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-autossh
|
||||
template:
|
||||
@ -9639,7 +9635,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-ceph
|
||||
template:
|
||||
@ -9656,7 +9652,7 @@ projects:
|
||||
- gate-puppet-ceph-puppet-beaker-rspec-ubuntu-trusty-nv
|
||||
- gate-puppet-ceph-puppet-beaker-rspec-centos-7-nv
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-cinder
|
||||
template:
|
||||
@ -9672,7 +9668,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-congress
|
||||
template:
|
||||
@ -9716,7 +9712,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-gnocchi
|
||||
template:
|
||||
@ -9731,7 +9727,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-heat
|
||||
template:
|
||||
@ -9746,7 +9742,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-horizon
|
||||
template:
|
||||
@ -9761,7 +9757,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-ironic
|
||||
template:
|
||||
@ -9776,7 +9772,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-keystone
|
||||
template:
|
||||
@ -9791,7 +9787,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-magnum
|
||||
template:
|
||||
@ -9872,7 +9868,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-nova
|
||||
template:
|
||||
@ -9886,7 +9882,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-octavia
|
||||
template:
|
||||
@ -9975,7 +9971,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-oslo
|
||||
template:
|
||||
@ -9989,7 +9985,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-ovn
|
||||
template:
|
||||
@ -10011,7 +10007,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-ha
|
||||
- gate-tripleo-ci-centos-7-ha
|
||||
|
||||
- name: openstack/puppet-rally
|
||||
template:
|
||||
@ -10059,7 +10055,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-tacker
|
||||
template:
|
||||
@ -10132,7 +10128,7 @@ projects:
|
||||
- name: puppet-branch-tarball-jobs
|
||||
- name: openstack-server-release-jobs
|
||||
check-tripleo:
|
||||
- gate-tripleo-ci-f22-nonha
|
||||
- gate-tripleo-ci-centos-7-nonha
|
||||
|
||||
- name: openstack/puppet-watcher
|
||||
template:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user