From 8a9f755cb91dce22380998a28a653dd815875d15 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Mon, 15 Jun 2020 13:54:26 +0200 Subject: [PATCH] Trailing is a deliverable type, not a release model Cycle-trailing deliverables are regular cycle-following deliverables, using RCs or not not using RCs -- they just have a different deadline. Rather than using a release model, those deadline variants are better described using deliverable types, in much the same way 'library' deliverables have a specific deadline too. This simplifies the list of models significantly, and allows to have proposer validation of trailing deliverables that use RCs or not use RCs. For compatibility in old branches, setting 'cycle-trailing' is still supported, it will just overload the type to 'trailing' if specified. Change-Id: Ifce88ef3e5dd406f45f25214699f16e736ad5377 --- deliverables/ussuri/cinderlib.yaml | 4 +- deliverables/ussuri/kayobe.yaml | 4 +- deliverables/ussuri/kolla-ansible.yaml | 4 +- deliverables/ussuri/kolla-cli.yaml | 4 +- deliverables/ussuri/kolla.yaml | 4 +- deliverables/ussuri/openstack-ansible.yaml | 4 +- deliverables/ussuri/os-apply-config.yaml | 4 +- deliverables/ussuri/os-collect-config.yaml | 4 +- deliverables/ussuri/os-net-config.yaml | 4 +- deliverables/ussuri/os-refresh-config.yaml | 4 +- deliverables/ussuri/paunch.yaml | 4 +- deliverables/ussuri/puppet-aodh.yaml | 4 +- deliverables/ussuri/puppet-barbican.yaml | 4 +- deliverables/ussuri/puppet-ceilometer.yaml | 4 +- deliverables/ussuri/puppet-cinder.yaml | 4 +- deliverables/ussuri/puppet-cloudkitty.yaml | 4 +- deliverables/ussuri/puppet-congress.yaml | 4 +- deliverables/ussuri/puppet-designate.yaml | 4 +- deliverables/ussuri/puppet-ec2api.yaml | 4 +- deliverables/ussuri/puppet-freezer.yaml | 4 +- deliverables/ussuri/puppet-glance.yaml | 4 +- deliverables/ussuri/puppet-glare.yaml | 4 +- deliverables/ussuri/puppet-gnocchi.yaml | 4 +- deliverables/ussuri/puppet-heat.yaml | 4 +- deliverables/ussuri/puppet-horizon.yaml | 4 +- deliverables/ussuri/puppet-ironic.yaml | 4 +- deliverables/ussuri/puppet-keystone.yaml | 4 +- deliverables/ussuri/puppet-magnum.yaml | 4 +- deliverables/ussuri/puppet-manila.yaml | 4 +- deliverables/ussuri/puppet-mistral.yaml | 4 +- deliverables/ussuri/puppet-monasca.yaml | 4 +- deliverables/ussuri/puppet-murano.yaml | 4 +- deliverables/ussuri/puppet-neutron.yaml | 4 +- deliverables/ussuri/puppet-nova.yaml | 4 +- deliverables/ussuri/puppet-octavia.yaml | 4 +- .../ussuri/puppet-openstack_extras.yaml | 4 +- deliverables/ussuri/puppet-openstacklib.yaml | 4 +- deliverables/ussuri/puppet-oslo.yaml | 4 +- deliverables/ussuri/puppet-ovn.yaml | 4 +- deliverables/ussuri/puppet-panko.yaml | 4 +- deliverables/ussuri/puppet-placement.yaml | 4 +- deliverables/ussuri/puppet-qdr.yaml | 4 +- deliverables/ussuri/puppet-rally.yaml | 4 +- deliverables/ussuri/puppet-sahara.yaml | 4 +- deliverables/ussuri/puppet-senlin.yaml | 4 +- deliverables/ussuri/puppet-swift.yaml | 4 +- deliverables/ussuri/puppet-tacker.yaml | 4 +- deliverables/ussuri/puppet-tempest.yaml | 4 +- deliverables/ussuri/puppet-tripleo.yaml | 4 +- deliverables/ussuri/puppet-trove.yaml | 4 +- deliverables/ussuri/puppet-vitrage.yaml | 4 +- deliverables/ussuri/puppet-vswitch.yaml | 4 +- deliverables/ussuri/puppet-watcher.yaml | 4 +- deliverables/ussuri/puppet-zaqar.yaml | 4 +- deliverables/ussuri/python-tripleoclient.yaml | 4 +- deliverables/ussuri/tripleo-ansible.yaml | 4 +- deliverables/ussuri/tripleo-common.yaml | 4 +- .../ussuri/tripleo-heat-templates.yaml | 4 +- .../ussuri/tripleo-image-elements.yaml | 4 +- deliverables/ussuri/tripleo-ipsec.yaml | 4 +- .../ussuri/tripleo-puppet-elements.yaml | 4 +- deliverables/ussuri/tripleo-validations.yaml | 4 +- deliverables/ussuri/validations-common.yaml | 4 +- deliverables/ussuri/validations-libs.yaml | 4 +- deliverables/victoria/cinderlib.yaml | 4 +- deliverables/victoria/kayobe.yaml | 4 +- deliverables/victoria/kolla-ansible.yaml | 4 +- deliverables/victoria/kolla-cli.yaml | 4 +- deliverables/victoria/kolla.yaml | 4 +- deliverables/victoria/openstack-ansible.yaml | 4 +- deliverables/victoria/os-apply-config.yaml | 4 +- deliverables/victoria/os-collect-config.yaml | 4 +- deliverables/victoria/os-net-config.yaml | 4 +- deliverables/victoria/os-refresh-config.yaml | 4 +- deliverables/victoria/paunch.yaml | 4 +- deliverables/victoria/puppet-aodh.yaml | 4 +- deliverables/victoria/puppet-barbican.yaml | 4 +- deliverables/victoria/puppet-ceilometer.yaml | 4 +- deliverables/victoria/puppet-cinder.yaml | 4 +- deliverables/victoria/puppet-cloudkitty.yaml | 4 +- deliverables/victoria/puppet-congress.yaml | 4 +- deliverables/victoria/puppet-designate.yaml | 4 +- deliverables/victoria/puppet-ec2api.yaml | 4 +- deliverables/victoria/puppet-freezer.yaml | 4 +- deliverables/victoria/puppet-glance.yaml | 4 +- deliverables/victoria/puppet-glare.yaml | 4 +- deliverables/victoria/puppet-gnocchi.yaml | 4 +- deliverables/victoria/puppet-heat.yaml | 4 +- deliverables/victoria/puppet-horizon.yaml | 4 +- deliverables/victoria/puppet-ironic.yaml | 4 +- deliverables/victoria/puppet-keystone.yaml | 4 +- deliverables/victoria/puppet-magnum.yaml | 4 +- deliverables/victoria/puppet-manila.yaml | 4 +- deliverables/victoria/puppet-mistral.yaml | 4 +- deliverables/victoria/puppet-monasca.yaml | 4 +- deliverables/victoria/puppet-murano.yaml | 4 +- deliverables/victoria/puppet-neutron.yaml | 4 +- deliverables/victoria/puppet-nova.yaml | 4 +- deliverables/victoria/puppet-octavia.yaml | 4 +- .../victoria/puppet-openstack_extras.yaml | 4 +- .../victoria/puppet-openstacklib.yaml | 4 +- deliverables/victoria/puppet-oslo.yaml | 4 +- deliverables/victoria/puppet-ovn.yaml | 4 +- deliverables/victoria/puppet-panko.yaml | 4 +- deliverables/victoria/puppet-placement.yaml | 4 +- deliverables/victoria/puppet-qdr.yaml | 4 +- deliverables/victoria/puppet-rally.yaml | 4 +- deliverables/victoria/puppet-sahara.yaml | 4 +- deliverables/victoria/puppet-senlin.yaml | 4 +- deliverables/victoria/puppet-swift.yaml | 4 +- deliverables/victoria/puppet-tacker.yaml | 4 +- deliverables/victoria/puppet-tempest.yaml | 4 +- deliverables/victoria/puppet-tripleo.yaml | 4 +- deliverables/victoria/puppet-trove.yaml | 4 +- deliverables/victoria/puppet-vitrage.yaml | 4 +- deliverables/victoria/puppet-vswitch.yaml | 4 +- deliverables/victoria/puppet-watcher.yaml | 4 +- deliverables/victoria/puppet-zaqar.yaml | 4 +- .../victoria/python-tripleoclient.yaml | 4 +- deliverables/victoria/tripleo-ansible.yaml | 4 +- deliverables/victoria/tripleo-common.yaml | 4 +- .../victoria/tripleo-heat-templates.yaml | 4 +- .../victoria/tripleo-image-elements.yaml | 4 +- deliverables/victoria/tripleo-ipsec.yaml | 4 +- .../victoria/tripleo-puppet-elements.yaml | 4 +- .../victoria/tripleo-validations.yaml | 4 +- deliverables/victoria/validations-common.yaml | 4 +- deliverables/victoria/validations-libs.yaml | 4 +- doc/source/_exts/deliverables.py | 6 +- doc/source/reference/deliverable_types.rst | 56 +++++-- doc/source/reference/process.rst | 2 +- doc/source/reference/release_models.rst | 153 ++++++++++-------- doc/source/reference/using.rst | 3 +- openstack_releases/cmds/list_deliverables.py | 6 +- .../cmds/propose_final_releases.py | 4 +- .../cmds/propose_library_branches.py | 8 +- openstack_releases/deliverable.py | 2 + openstack_releases/schema.yaml | 2 +- 138 files changed, 399 insertions(+), 355 deletions(-) diff --git a/deliverables/ussuri/cinderlib.yaml b/deliverables/ussuri/cinderlib.yaml index 2c61182d80..cc8fe98e77 100644 --- a/deliverables/ussuri/cinderlib.yaml +++ b/deliverables/ussuri/cinderlib.yaml @@ -1,7 +1,7 @@ --- launchpad: cinderlib -release-model: cycle-trailing +release-model: cycle-with-intermediary team: cinder -type: other +type: trailing repository-settings: openstack/cinderlib: {} diff --git a/deliverables/ussuri/kayobe.yaml b/deliverables/ussuri/kayobe.yaml index dda2351c90..c2e749a77f 100644 --- a/deliverables/ussuri/kayobe.yaml +++ b/deliverables/ussuri/kayobe.yaml @@ -1,8 +1,8 @@ --- storyboard: openstack/kayobe -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kayobe: {} openstack/kayobe-config: diff --git a/deliverables/ussuri/kolla-ansible.yaml b/deliverables/ussuri/kolla-ansible.yaml index ddd8026107..a61930c4ce 100644 --- a/deliverables/ussuri/kolla-ansible.yaml +++ b/deliverables/ussuri/kolla-ansible.yaml @@ -1,8 +1,8 @@ --- launchpad: kolla-ansible -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla-ansible: {} releases: diff --git a/deliverables/ussuri/kolla-cli.yaml b/deliverables/ussuri/kolla-cli.yaml index 935d603c1a..d0c61bdc8b 100644 --- a/deliverables/ussuri/kolla-cli.yaml +++ b/deliverables/ussuri/kolla-cli.yaml @@ -1,8 +1,8 @@ --- launchpad: kolla-cli -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla-cli: {} releases: diff --git a/deliverables/ussuri/kolla.yaml b/deliverables/ussuri/kolla.yaml index 8bfcc44bab..6749e32157 100644 --- a/deliverables/ussuri/kolla.yaml +++ b/deliverables/ussuri/kolla.yaml @@ -1,8 +1,8 @@ --- launchpad: kolla -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla: {} cycle-highlights: diff --git a/deliverables/ussuri/openstack-ansible.yaml b/deliverables/ussuri/openstack-ansible.yaml index c63812164b..e88f8471f5 100644 --- a/deliverables/ussuri/openstack-ansible.yaml +++ b/deliverables/ussuri/openstack-ansible.yaml @@ -1,9 +1,9 @@ --- artifact-link-mode: none launchpad: openstack-ansible -release-model: cycle-trailing +release-model: cycle-with-rc team: OpenStackAnsible -type: other +type: trailing repository-settings: openstack/openstack-ansible: {} cycle-highlights: diff --git a/deliverables/ussuri/os-apply-config.yaml b/deliverables/ussuri/os-apply-config.yaml index c4ac9b6c0d..f1f609f23c 100644 --- a/deliverables/ussuri/os-apply-config.yaml +++ b/deliverables/ussuri/os-apply-config.yaml @@ -1,9 +1,9 @@ --- launchpad: os-apply-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-apply-config: {} releases: diff --git a/deliverables/ussuri/os-collect-config.yaml b/deliverables/ussuri/os-collect-config.yaml index 0f93cd0899..936262b0ba 100644 --- a/deliverables/ussuri/os-collect-config.yaml +++ b/deliverables/ussuri/os-collect-config.yaml @@ -1,9 +1,9 @@ --- launchpad: os-collect-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-collect-config: {} releases: diff --git a/deliverables/ussuri/os-net-config.yaml b/deliverables/ussuri/os-net-config.yaml index 339c13415c..9b5459c444 100644 --- a/deliverables/ussuri/os-net-config.yaml +++ b/deliverables/ussuri/os-net-config.yaml @@ -1,9 +1,9 @@ --- launchpad: os-net-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-net-config: {} releases: diff --git a/deliverables/ussuri/os-refresh-config.yaml b/deliverables/ussuri/os-refresh-config.yaml index a72e7c33f0..b5b7eeb157 100644 --- a/deliverables/ussuri/os-refresh-config.yaml +++ b/deliverables/ussuri/os-refresh-config.yaml @@ -1,8 +1,8 @@ --- launchpad: os-refresh-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-refresh-config: {} diff --git a/deliverables/ussuri/paunch.yaml b/deliverables/ussuri/paunch.yaml index d2f76b434b..01a8ab39d6 100644 --- a/deliverables/ussuri/paunch.yaml +++ b/deliverables/ussuri/paunch.yaml @@ -1,9 +1,9 @@ --- launchpad: paunch -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/paunch: {} releases: diff --git a/deliverables/ussuri/puppet-aodh.yaml b/deliverables/ussuri/puppet-aodh.yaml index 263af14202..d2d2e1ade7 100644 --- a/deliverables/ussuri/puppet-aodh.yaml +++ b/deliverables/ussuri/puppet-aodh.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-aodh -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-aodh: {} releases: diff --git a/deliverables/ussuri/puppet-barbican.yaml b/deliverables/ussuri/puppet-barbican.yaml index f15c8b4c1e..c6e0dd42a0 100644 --- a/deliverables/ussuri/puppet-barbican.yaml +++ b/deliverables/ussuri/puppet-barbican.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-barbican -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-barbican: {} releases: diff --git a/deliverables/ussuri/puppet-ceilometer.yaml b/deliverables/ussuri/puppet-ceilometer.yaml index 0fcf14770c..c9f9b80475 100644 --- a/deliverables/ussuri/puppet-ceilometer.yaml +++ b/deliverables/ussuri/puppet-ceilometer.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-ceilometer -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ceilometer: {} releases: diff --git a/deliverables/ussuri/puppet-cinder.yaml b/deliverables/ussuri/puppet-cinder.yaml index 7170d7db87..67d362eb7c 100644 --- a/deliverables/ussuri/puppet-cinder.yaml +++ b/deliverables/ussuri/puppet-cinder.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-cinder -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-cinder: {} releases: diff --git a/deliverables/ussuri/puppet-cloudkitty.yaml b/deliverables/ussuri/puppet-cloudkitty.yaml index 8555dbe78a..c7f8802d96 100644 --- a/deliverables/ussuri/puppet-cloudkitty.yaml +++ b/deliverables/ussuri/puppet-cloudkitty.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-cloudkitty -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-cloudkitty: {} releases: diff --git a/deliverables/ussuri/puppet-congress.yaml b/deliverables/ussuri/puppet-congress.yaml index 598e5e9607..0bb52a7d0e 100644 --- a/deliverables/ussuri/puppet-congress.yaml +++ b/deliverables/ussuri/puppet-congress.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-congress -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-congress: {} releases: diff --git a/deliverables/ussuri/puppet-designate.yaml b/deliverables/ussuri/puppet-designate.yaml index 7f8df20441..9dae05c2df 100644 --- a/deliverables/ussuri/puppet-designate.yaml +++ b/deliverables/ussuri/puppet-designate.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-designate -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-designate: {} releases: diff --git a/deliverables/ussuri/puppet-ec2api.yaml b/deliverables/ussuri/puppet-ec2api.yaml index 6b317a192b..da600323b6 100644 --- a/deliverables/ussuri/puppet-ec2api.yaml +++ b/deliverables/ussuri/puppet-ec2api.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-ec2api -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ec2api: {} releases: diff --git a/deliverables/ussuri/puppet-freezer.yaml b/deliverables/ussuri/puppet-freezer.yaml index 375292742c..c136ed005e 100644 --- a/deliverables/ussuri/puppet-freezer.yaml +++ b/deliverables/ussuri/puppet-freezer.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-freezer -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-freezer: {} releases: diff --git a/deliverables/ussuri/puppet-glance.yaml b/deliverables/ussuri/puppet-glance.yaml index 926ba3204a..8401098142 100644 --- a/deliverables/ussuri/puppet-glance.yaml +++ b/deliverables/ussuri/puppet-glance.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-glance -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-glance: {} releases: diff --git a/deliverables/ussuri/puppet-glare.yaml b/deliverables/ussuri/puppet-glare.yaml index bd142f1a71..c39f16a460 100644 --- a/deliverables/ussuri/puppet-glare.yaml +++ b/deliverables/ussuri/puppet-glare.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-glare -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-glare: {} releases: diff --git a/deliverables/ussuri/puppet-gnocchi.yaml b/deliverables/ussuri/puppet-gnocchi.yaml index 6d34f54194..bc247d0b30 100644 --- a/deliverables/ussuri/puppet-gnocchi.yaml +++ b/deliverables/ussuri/puppet-gnocchi.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-gnocchi -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-gnocchi: {} releases: diff --git a/deliverables/ussuri/puppet-heat.yaml b/deliverables/ussuri/puppet-heat.yaml index e360f61a80..3aa5bb54ae 100644 --- a/deliverables/ussuri/puppet-heat.yaml +++ b/deliverables/ussuri/puppet-heat.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-heat -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-heat: {} releases: diff --git a/deliverables/ussuri/puppet-horizon.yaml b/deliverables/ussuri/puppet-horizon.yaml index c0e01788fc..f952415d9a 100644 --- a/deliverables/ussuri/puppet-horizon.yaml +++ b/deliverables/ussuri/puppet-horizon.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-horizon -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-horizon: {} releases: diff --git a/deliverables/ussuri/puppet-ironic.yaml b/deliverables/ussuri/puppet-ironic.yaml index 8060b16dfb..6ca322fc16 100644 --- a/deliverables/ussuri/puppet-ironic.yaml +++ b/deliverables/ussuri/puppet-ironic.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-ironic -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ironic: {} releases: diff --git a/deliverables/ussuri/puppet-keystone.yaml b/deliverables/ussuri/puppet-keystone.yaml index c6bf10676e..56bb0cfbe1 100644 --- a/deliverables/ussuri/puppet-keystone.yaml +++ b/deliverables/ussuri/puppet-keystone.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-keystone -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-keystone: {} releases: diff --git a/deliverables/ussuri/puppet-magnum.yaml b/deliverables/ussuri/puppet-magnum.yaml index 2e85ad57c9..6ff0178e9f 100644 --- a/deliverables/ussuri/puppet-magnum.yaml +++ b/deliverables/ussuri/puppet-magnum.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-magnum -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-magnum: {} releases: diff --git a/deliverables/ussuri/puppet-manila.yaml b/deliverables/ussuri/puppet-manila.yaml index 12b4ed08ad..fa5dab72d1 100644 --- a/deliverables/ussuri/puppet-manila.yaml +++ b/deliverables/ussuri/puppet-manila.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-manila -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-manila: {} releases: diff --git a/deliverables/ussuri/puppet-mistral.yaml b/deliverables/ussuri/puppet-mistral.yaml index a5927e6392..94f58076db 100644 --- a/deliverables/ussuri/puppet-mistral.yaml +++ b/deliverables/ussuri/puppet-mistral.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-mistral -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-mistral: {} releases: diff --git a/deliverables/ussuri/puppet-monasca.yaml b/deliverables/ussuri/puppet-monasca.yaml index a4f2953f30..7e27fe34f7 100644 --- a/deliverables/ussuri/puppet-monasca.yaml +++ b/deliverables/ussuri/puppet-monasca.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-monasca -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-monasca: {} releases: diff --git a/deliverables/ussuri/puppet-murano.yaml b/deliverables/ussuri/puppet-murano.yaml index aca5850949..6a91ac6539 100644 --- a/deliverables/ussuri/puppet-murano.yaml +++ b/deliverables/ussuri/puppet-murano.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-murano -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-murano: {} releases: diff --git a/deliverables/ussuri/puppet-neutron.yaml b/deliverables/ussuri/puppet-neutron.yaml index 1c3ac318bb..c048b6de59 100644 --- a/deliverables/ussuri/puppet-neutron.yaml +++ b/deliverables/ussuri/puppet-neutron.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-neutron -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-neutron: {} releases: diff --git a/deliverables/ussuri/puppet-nova.yaml b/deliverables/ussuri/puppet-nova.yaml index 5a221a298b..7f1edfdae9 100644 --- a/deliverables/ussuri/puppet-nova.yaml +++ b/deliverables/ussuri/puppet-nova.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-nova -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-nova: {} releases: diff --git a/deliverables/ussuri/puppet-octavia.yaml b/deliverables/ussuri/puppet-octavia.yaml index 7c69a74490..414340752f 100644 --- a/deliverables/ussuri/puppet-octavia.yaml +++ b/deliverables/ussuri/puppet-octavia.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-octavia -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-octavia: {} releases: diff --git a/deliverables/ussuri/puppet-openstack_extras.yaml b/deliverables/ussuri/puppet-openstack_extras.yaml index a19aae1fa8..5bf76285ae 100644 --- a/deliverables/ussuri/puppet-openstack_extras.yaml +++ b/deliverables/ussuri/puppet-openstack_extras.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-openstack-extras -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-openstack_extras: {} releases: diff --git a/deliverables/ussuri/puppet-openstacklib.yaml b/deliverables/ussuri/puppet-openstacklib.yaml index be28a09346..92654c3bac 100644 --- a/deliverables/ussuri/puppet-openstacklib.yaml +++ b/deliverables/ussuri/puppet-openstacklib.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-openstacklib -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-openstacklib: {} releases: diff --git a/deliverables/ussuri/puppet-oslo.yaml b/deliverables/ussuri/puppet-oslo.yaml index 0d8a542c3f..5aa301cde8 100644 --- a/deliverables/ussuri/puppet-oslo.yaml +++ b/deliverables/ussuri/puppet-oslo.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-oslo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-oslo: {} releases: diff --git a/deliverables/ussuri/puppet-ovn.yaml b/deliverables/ussuri/puppet-ovn.yaml index 16b3b4c8ba..50edb2f0f3 100644 --- a/deliverables/ussuri/puppet-ovn.yaml +++ b/deliverables/ussuri/puppet-ovn.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-ovn -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ovn: {} releases: diff --git a/deliverables/ussuri/puppet-panko.yaml b/deliverables/ussuri/puppet-panko.yaml index 268c6d7164..f0b456b6e6 100644 --- a/deliverables/ussuri/puppet-panko.yaml +++ b/deliverables/ussuri/puppet-panko.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-panko -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-panko: {} releases: diff --git a/deliverables/ussuri/puppet-placement.yaml b/deliverables/ussuri/puppet-placement.yaml index 81b1bf31c1..fe670b1dee 100644 --- a/deliverables/ussuri/puppet-placement.yaml +++ b/deliverables/ussuri/puppet-placement.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-placement -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-placement: {} releases: diff --git a/deliverables/ussuri/puppet-qdr.yaml b/deliverables/ussuri/puppet-qdr.yaml index 7aaaaee9e0..83a92827ab 100644 --- a/deliverables/ussuri/puppet-qdr.yaml +++ b/deliverables/ussuri/puppet-qdr.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-qdr -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-qdr: {} releases: diff --git a/deliverables/ussuri/puppet-rally.yaml b/deliverables/ussuri/puppet-rally.yaml index 608c86784e..7bca5c112a 100644 --- a/deliverables/ussuri/puppet-rally.yaml +++ b/deliverables/ussuri/puppet-rally.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-rally -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-rally: {} releases: diff --git a/deliverables/ussuri/puppet-sahara.yaml b/deliverables/ussuri/puppet-sahara.yaml index b708ac10c6..148ef73ca6 100644 --- a/deliverables/ussuri/puppet-sahara.yaml +++ b/deliverables/ussuri/puppet-sahara.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-sahara -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-sahara: {} releases: diff --git a/deliverables/ussuri/puppet-senlin.yaml b/deliverables/ussuri/puppet-senlin.yaml index f3f0a090db..015bc9d725 100644 --- a/deliverables/ussuri/puppet-senlin.yaml +++ b/deliverables/ussuri/puppet-senlin.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-senlin -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-senlin: {} releases: diff --git a/deliverables/ussuri/puppet-swift.yaml b/deliverables/ussuri/puppet-swift.yaml index a83bd53950..295204e9c9 100644 --- a/deliverables/ussuri/puppet-swift.yaml +++ b/deliverables/ussuri/puppet-swift.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-swift -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-swift: {} releases: diff --git a/deliverables/ussuri/puppet-tacker.yaml b/deliverables/ussuri/puppet-tacker.yaml index 60979df17a..6d8bacd87a 100644 --- a/deliverables/ussuri/puppet-tacker.yaml +++ b/deliverables/ussuri/puppet-tacker.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-tacker -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-tacker: {} releases: diff --git a/deliverables/ussuri/puppet-tempest.yaml b/deliverables/ussuri/puppet-tempest.yaml index 4e048694e2..0f840a5a5d 100644 --- a/deliverables/ussuri/puppet-tempest.yaml +++ b/deliverables/ussuri/puppet-tempest.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-tempest -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-tempest: {} releases: diff --git a/deliverables/ussuri/puppet-tripleo.yaml b/deliverables/ussuri/puppet-tripleo.yaml index b5407d9dc5..639ec960e2 100644 --- a/deliverables/ussuri/puppet-tripleo.yaml +++ b/deliverables/ussuri/puppet-tripleo.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: tripleo -type: other +type: trailing repository-settings: openstack/puppet-tripleo: {} releases: diff --git a/deliverables/ussuri/puppet-trove.yaml b/deliverables/ussuri/puppet-trove.yaml index d6680c89d9..0702edb34a 100644 --- a/deliverables/ussuri/puppet-trove.yaml +++ b/deliverables/ussuri/puppet-trove.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-trove -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-trove: {} releases: diff --git a/deliverables/ussuri/puppet-vitrage.yaml b/deliverables/ussuri/puppet-vitrage.yaml index b4851185bd..01398e0e9c 100644 --- a/deliverables/ussuri/puppet-vitrage.yaml +++ b/deliverables/ussuri/puppet-vitrage.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-vitrage -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-vitrage: {} releases: diff --git a/deliverables/ussuri/puppet-vswitch.yaml b/deliverables/ussuri/puppet-vswitch.yaml index d0e2703428..50ecd22c8e 100644 --- a/deliverables/ussuri/puppet-vswitch.yaml +++ b/deliverables/ussuri/puppet-vswitch.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-vswitch -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-vswitch: {} releases: diff --git a/deliverables/ussuri/puppet-watcher.yaml b/deliverables/ussuri/puppet-watcher.yaml index c48dad9f7c..db3b18c876 100644 --- a/deliverables/ussuri/puppet-watcher.yaml +++ b/deliverables/ussuri/puppet-watcher.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-watcher -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-watcher: {} releases: diff --git a/deliverables/ussuri/puppet-zaqar.yaml b/deliverables/ussuri/puppet-zaqar.yaml index c742032261..15c625f464 100644 --- a/deliverables/ussuri/puppet-zaqar.yaml +++ b/deliverables/ussuri/puppet-zaqar.yaml @@ -1,8 +1,8 @@ --- launchpad: puppet-zaqar -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-zaqar: {} releases: diff --git a/deliverables/ussuri/python-tripleoclient.yaml b/deliverables/ussuri/python-tripleoclient.yaml index 6f6763aba7..2f992d5ae9 100644 --- a/deliverables/ussuri/python-tripleoclient.yaml +++ b/deliverables/ussuri/python-tripleoclient.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: client-library +type: trailing repository-settings: openstack/python-tripleoclient: {} releases: diff --git a/deliverables/ussuri/tripleo-ansible.yaml b/deliverables/ussuri/tripleo-ansible.yaml index f06199a7b0..5d6d1def95 100644 --- a/deliverables/ussuri/tripleo-ansible.yaml +++ b/deliverables/ussuri/tripleo-ansible.yaml @@ -1,9 +1,9 @@ --- artifact-link-mode: none launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-ansible: {} releases: diff --git a/deliverables/ussuri/tripleo-common.yaml b/deliverables/ussuri/tripleo-common.yaml index aa690d00eb..12083a7972 100644 --- a/deliverables/ussuri/tripleo-common.yaml +++ b/deliverables/ussuri/tripleo-common.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo-common -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-common: {} releases: diff --git a/deliverables/ussuri/tripleo-heat-templates.yaml b/deliverables/ussuri/tripleo-heat-templates.yaml index 3d9db4290e..eb0ebcc701 100644 --- a/deliverables/ussuri/tripleo-heat-templates.yaml +++ b/deliverables/ussuri/tripleo-heat-templates.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-heat-templates: {} releases: diff --git a/deliverables/ussuri/tripleo-image-elements.yaml b/deliverables/ussuri/tripleo-image-elements.yaml index e5d82c2d03..d08b43f384 100644 --- a/deliverables/ussuri/tripleo-image-elements.yaml +++ b/deliverables/ussuri/tripleo-image-elements.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-image-elements: {} releases: diff --git a/deliverables/ussuri/tripleo-ipsec.yaml b/deliverables/ussuri/tripleo-ipsec.yaml index b797d55bc3..a7e12c1703 100644 --- a/deliverables/ussuri/tripleo-ipsec.yaml +++ b/deliverables/ussuri/tripleo-ipsec.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-ipsec: {} releases: diff --git a/deliverables/ussuri/tripleo-puppet-elements.yaml b/deliverables/ussuri/tripleo-puppet-elements.yaml index 158ef7809a..64185adf88 100644 --- a/deliverables/ussuri/tripleo-puppet-elements.yaml +++ b/deliverables/ussuri/tripleo-puppet-elements.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-puppet-elements: {} releases: diff --git a/deliverables/ussuri/tripleo-validations.yaml b/deliverables/ussuri/tripleo-validations.yaml index ff025e98ea..ad31893375 100644 --- a/deliverables/ussuri/tripleo-validations.yaml +++ b/deliverables/ussuri/tripleo-validations.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-validations: {} releases: diff --git a/deliverables/ussuri/validations-common.yaml b/deliverables/ussuri/validations-common.yaml index f5b2ad22ac..ff504fc6d0 100644 --- a/deliverables/ussuri/validations-common.yaml +++ b/deliverables/ussuri/validations-common.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/validations-common: {} releases: diff --git a/deliverables/ussuri/validations-libs.yaml b/deliverables/ussuri/validations-libs.yaml index bbf8a0df51..dcdce29144 100644 --- a/deliverables/ussuri/validations-libs.yaml +++ b/deliverables/ussuri/validations-libs.yaml @@ -1,9 +1,9 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/validations-libs: {} releases: diff --git a/deliverables/victoria/cinderlib.yaml b/deliverables/victoria/cinderlib.yaml index 2c61182d80..cc8fe98e77 100644 --- a/deliverables/victoria/cinderlib.yaml +++ b/deliverables/victoria/cinderlib.yaml @@ -1,7 +1,7 @@ --- launchpad: cinderlib -release-model: cycle-trailing +release-model: cycle-with-intermediary team: cinder -type: other +type: trailing repository-settings: openstack/cinderlib: {} diff --git a/deliverables/victoria/kayobe.yaml b/deliverables/victoria/kayobe.yaml index 8d30a77293..9b394fa677 100644 --- a/deliverables/victoria/kayobe.yaml +++ b/deliverables/victoria/kayobe.yaml @@ -1,8 +1,8 @@ --- storyboard: openstack/kayobe -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kayobe: {} openstack/kayobe-config: diff --git a/deliverables/victoria/kolla-ansible.yaml b/deliverables/victoria/kolla-ansible.yaml index 0028e5e639..7bae4aae5b 100644 --- a/deliverables/victoria/kolla-ansible.yaml +++ b/deliverables/victoria/kolla-ansible.yaml @@ -1,7 +1,7 @@ --- launchpad: kolla-ansible -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla-ansible: {} diff --git a/deliverables/victoria/kolla-cli.yaml b/deliverables/victoria/kolla-cli.yaml index 2cbc084173..a85ae78107 100644 --- a/deliverables/victoria/kolla-cli.yaml +++ b/deliverables/victoria/kolla-cli.yaml @@ -1,7 +1,7 @@ --- launchpad: kolla-cli -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla-cli: {} diff --git a/deliverables/victoria/kolla.yaml b/deliverables/victoria/kolla.yaml index f4ca5e998d..0058550f7d 100644 --- a/deliverables/victoria/kolla.yaml +++ b/deliverables/victoria/kolla.yaml @@ -1,7 +1,7 @@ --- launchpad: kolla -release-model: cycle-trailing +release-model: cycle-with-rc team: kolla -type: other +type: trailing repository-settings: openstack/kolla: {} diff --git a/deliverables/victoria/openstack-ansible.yaml b/deliverables/victoria/openstack-ansible.yaml index bd2d6160fd..579a380edb 100644 --- a/deliverables/victoria/openstack-ansible.yaml +++ b/deliverables/victoria/openstack-ansible.yaml @@ -1,8 +1,8 @@ --- artifact-link-mode: none launchpad: openstack-ansible -release-model: cycle-trailing +release-model: cycle-with-rc team: OpenStackAnsible -type: other +type: trailing repository-settings: openstack/openstack-ansible: {} diff --git a/deliverables/victoria/os-apply-config.yaml b/deliverables/victoria/os-apply-config.yaml index 1ef9c96554..d18a355ba8 100644 --- a/deliverables/victoria/os-apply-config.yaml +++ b/deliverables/victoria/os-apply-config.yaml @@ -1,8 +1,8 @@ --- launchpad: os-apply-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-apply-config: {} diff --git a/deliverables/victoria/os-collect-config.yaml b/deliverables/victoria/os-collect-config.yaml index 2f1d02b6c5..a32d3514b4 100644 --- a/deliverables/victoria/os-collect-config.yaml +++ b/deliverables/victoria/os-collect-config.yaml @@ -1,8 +1,8 @@ --- launchpad: os-collect-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-collect-config: {} diff --git a/deliverables/victoria/os-net-config.yaml b/deliverables/victoria/os-net-config.yaml index 0ddfb56429..50b214de00 100644 --- a/deliverables/victoria/os-net-config.yaml +++ b/deliverables/victoria/os-net-config.yaml @@ -1,8 +1,8 @@ --- launchpad: os-net-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-net-config: {} diff --git a/deliverables/victoria/os-refresh-config.yaml b/deliverables/victoria/os-refresh-config.yaml index a72e7c33f0..b5b7eeb157 100644 --- a/deliverables/victoria/os-refresh-config.yaml +++ b/deliverables/victoria/os-refresh-config.yaml @@ -1,8 +1,8 @@ --- launchpad: os-refresh-config -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/os-refresh-config: {} diff --git a/deliverables/victoria/paunch.yaml b/deliverables/victoria/paunch.yaml index 806e84b7fe..b083e6134b 100644 --- a/deliverables/victoria/paunch.yaml +++ b/deliverables/victoria/paunch.yaml @@ -1,8 +1,8 @@ --- launchpad: paunch -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/paunch: {} diff --git a/deliverables/victoria/puppet-aodh.yaml b/deliverables/victoria/puppet-aodh.yaml index 9942cd830d..234ee3c634 100644 --- a/deliverables/victoria/puppet-aodh.yaml +++ b/deliverables/victoria/puppet-aodh.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-aodh -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-aodh: {} diff --git a/deliverables/victoria/puppet-barbican.yaml b/deliverables/victoria/puppet-barbican.yaml index 1ddbf81aed..8ec8a1d755 100644 --- a/deliverables/victoria/puppet-barbican.yaml +++ b/deliverables/victoria/puppet-barbican.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-barbican -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-barbican: {} diff --git a/deliverables/victoria/puppet-ceilometer.yaml b/deliverables/victoria/puppet-ceilometer.yaml index 7bb37178a9..c331bd14b7 100644 --- a/deliverables/victoria/puppet-ceilometer.yaml +++ b/deliverables/victoria/puppet-ceilometer.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-ceilometer -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ceilometer: {} diff --git a/deliverables/victoria/puppet-cinder.yaml b/deliverables/victoria/puppet-cinder.yaml index 7e5c3f015a..2e8f775e89 100644 --- a/deliverables/victoria/puppet-cinder.yaml +++ b/deliverables/victoria/puppet-cinder.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-cinder -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-cinder: {} diff --git a/deliverables/victoria/puppet-cloudkitty.yaml b/deliverables/victoria/puppet-cloudkitty.yaml index d6e2a0fc35..8a09cc4cb7 100644 --- a/deliverables/victoria/puppet-cloudkitty.yaml +++ b/deliverables/victoria/puppet-cloudkitty.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-cloudkitty -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-cloudkitty: {} diff --git a/deliverables/victoria/puppet-congress.yaml b/deliverables/victoria/puppet-congress.yaml index b574cfcbff..f7b42675cf 100644 --- a/deliverables/victoria/puppet-congress.yaml +++ b/deliverables/victoria/puppet-congress.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-congress -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-congress: {} diff --git a/deliverables/victoria/puppet-designate.yaml b/deliverables/victoria/puppet-designate.yaml index 82ed46a274..6be6612c74 100644 --- a/deliverables/victoria/puppet-designate.yaml +++ b/deliverables/victoria/puppet-designate.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-designate -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-designate: {} diff --git a/deliverables/victoria/puppet-ec2api.yaml b/deliverables/victoria/puppet-ec2api.yaml index b83499ba80..6324f410bf 100644 --- a/deliverables/victoria/puppet-ec2api.yaml +++ b/deliverables/victoria/puppet-ec2api.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-ec2api -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ec2api: {} diff --git a/deliverables/victoria/puppet-freezer.yaml b/deliverables/victoria/puppet-freezer.yaml index bd95377c54..2bf2c2659b 100644 --- a/deliverables/victoria/puppet-freezer.yaml +++ b/deliverables/victoria/puppet-freezer.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-freezer -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-freezer: {} diff --git a/deliverables/victoria/puppet-glance.yaml b/deliverables/victoria/puppet-glance.yaml index 4be0308795..fdeb917cfd 100644 --- a/deliverables/victoria/puppet-glance.yaml +++ b/deliverables/victoria/puppet-glance.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-glance -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-glance: {} diff --git a/deliverables/victoria/puppet-glare.yaml b/deliverables/victoria/puppet-glare.yaml index 3da2906b1c..1ccb1d8522 100644 --- a/deliverables/victoria/puppet-glare.yaml +++ b/deliverables/victoria/puppet-glare.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-glare -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-glare: {} diff --git a/deliverables/victoria/puppet-gnocchi.yaml b/deliverables/victoria/puppet-gnocchi.yaml index 3283450b26..606003cb08 100644 --- a/deliverables/victoria/puppet-gnocchi.yaml +++ b/deliverables/victoria/puppet-gnocchi.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-gnocchi -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-gnocchi: {} diff --git a/deliverables/victoria/puppet-heat.yaml b/deliverables/victoria/puppet-heat.yaml index 611bdaafed..f86b91ee59 100644 --- a/deliverables/victoria/puppet-heat.yaml +++ b/deliverables/victoria/puppet-heat.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-heat -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-heat: {} diff --git a/deliverables/victoria/puppet-horizon.yaml b/deliverables/victoria/puppet-horizon.yaml index 525ef7159f..6dd11ae814 100644 --- a/deliverables/victoria/puppet-horizon.yaml +++ b/deliverables/victoria/puppet-horizon.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-horizon -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-horizon: {} diff --git a/deliverables/victoria/puppet-ironic.yaml b/deliverables/victoria/puppet-ironic.yaml index 8bc7b303f4..057206255f 100644 --- a/deliverables/victoria/puppet-ironic.yaml +++ b/deliverables/victoria/puppet-ironic.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-ironic -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ironic: {} diff --git a/deliverables/victoria/puppet-keystone.yaml b/deliverables/victoria/puppet-keystone.yaml index 2bf820e232..f0d8c0ae73 100644 --- a/deliverables/victoria/puppet-keystone.yaml +++ b/deliverables/victoria/puppet-keystone.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-keystone -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-keystone: {} diff --git a/deliverables/victoria/puppet-magnum.yaml b/deliverables/victoria/puppet-magnum.yaml index eb9bdd9448..16e98788f5 100644 --- a/deliverables/victoria/puppet-magnum.yaml +++ b/deliverables/victoria/puppet-magnum.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-magnum -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-magnum: {} diff --git a/deliverables/victoria/puppet-manila.yaml b/deliverables/victoria/puppet-manila.yaml index b18c771168..89ccbf443b 100644 --- a/deliverables/victoria/puppet-manila.yaml +++ b/deliverables/victoria/puppet-manila.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-manila -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-manila: {} diff --git a/deliverables/victoria/puppet-mistral.yaml b/deliverables/victoria/puppet-mistral.yaml index 0e765e0329..3d832ad695 100644 --- a/deliverables/victoria/puppet-mistral.yaml +++ b/deliverables/victoria/puppet-mistral.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-mistral -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-mistral: {} diff --git a/deliverables/victoria/puppet-monasca.yaml b/deliverables/victoria/puppet-monasca.yaml index e985ae6281..ab27fb3193 100644 --- a/deliverables/victoria/puppet-monasca.yaml +++ b/deliverables/victoria/puppet-monasca.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-monasca -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-monasca: {} diff --git a/deliverables/victoria/puppet-murano.yaml b/deliverables/victoria/puppet-murano.yaml index 89392572d9..f4e7275b62 100644 --- a/deliverables/victoria/puppet-murano.yaml +++ b/deliverables/victoria/puppet-murano.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-murano -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-murano: {} diff --git a/deliverables/victoria/puppet-neutron.yaml b/deliverables/victoria/puppet-neutron.yaml index e69ebb87a5..57d222d7b1 100644 --- a/deliverables/victoria/puppet-neutron.yaml +++ b/deliverables/victoria/puppet-neutron.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-neutron -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-neutron: {} diff --git a/deliverables/victoria/puppet-nova.yaml b/deliverables/victoria/puppet-nova.yaml index 9778638a78..35a5434147 100644 --- a/deliverables/victoria/puppet-nova.yaml +++ b/deliverables/victoria/puppet-nova.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-nova -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-nova: {} diff --git a/deliverables/victoria/puppet-octavia.yaml b/deliverables/victoria/puppet-octavia.yaml index cb89cd1421..101f703266 100644 --- a/deliverables/victoria/puppet-octavia.yaml +++ b/deliverables/victoria/puppet-octavia.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-octavia -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-octavia: {} diff --git a/deliverables/victoria/puppet-openstack_extras.yaml b/deliverables/victoria/puppet-openstack_extras.yaml index 15f7db0e81..67e4ab6507 100644 --- a/deliverables/victoria/puppet-openstack_extras.yaml +++ b/deliverables/victoria/puppet-openstack_extras.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-openstack-extras -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-openstack_extras: {} diff --git a/deliverables/victoria/puppet-openstacklib.yaml b/deliverables/victoria/puppet-openstacklib.yaml index baca205ba2..d1b60e2d98 100644 --- a/deliverables/victoria/puppet-openstacklib.yaml +++ b/deliverables/victoria/puppet-openstacklib.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-openstacklib -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-openstacklib: {} diff --git a/deliverables/victoria/puppet-oslo.yaml b/deliverables/victoria/puppet-oslo.yaml index ff0d5ea4a3..1118dbc02b 100644 --- a/deliverables/victoria/puppet-oslo.yaml +++ b/deliverables/victoria/puppet-oslo.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-oslo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-oslo: {} diff --git a/deliverables/victoria/puppet-ovn.yaml b/deliverables/victoria/puppet-ovn.yaml index f9e06b11de..097cadf144 100644 --- a/deliverables/victoria/puppet-ovn.yaml +++ b/deliverables/victoria/puppet-ovn.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-ovn -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-ovn: {} diff --git a/deliverables/victoria/puppet-panko.yaml b/deliverables/victoria/puppet-panko.yaml index 94c0851f14..0147ec7444 100644 --- a/deliverables/victoria/puppet-panko.yaml +++ b/deliverables/victoria/puppet-panko.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-panko -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-panko: {} diff --git a/deliverables/victoria/puppet-placement.yaml b/deliverables/victoria/puppet-placement.yaml index 59990ab8c6..9e6067ba37 100644 --- a/deliverables/victoria/puppet-placement.yaml +++ b/deliverables/victoria/puppet-placement.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-placement -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-placement: {} diff --git a/deliverables/victoria/puppet-qdr.yaml b/deliverables/victoria/puppet-qdr.yaml index 2d4fee8176..f9f5143f7c 100644 --- a/deliverables/victoria/puppet-qdr.yaml +++ b/deliverables/victoria/puppet-qdr.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-qdr -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-qdr: {} diff --git a/deliverables/victoria/puppet-rally.yaml b/deliverables/victoria/puppet-rally.yaml index 0337f2fbf6..19d812c4e5 100644 --- a/deliverables/victoria/puppet-rally.yaml +++ b/deliverables/victoria/puppet-rally.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-rally -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-rally: {} diff --git a/deliverables/victoria/puppet-sahara.yaml b/deliverables/victoria/puppet-sahara.yaml index 306ef621ff..c151a67ac7 100644 --- a/deliverables/victoria/puppet-sahara.yaml +++ b/deliverables/victoria/puppet-sahara.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-sahara -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-sahara: {} diff --git a/deliverables/victoria/puppet-senlin.yaml b/deliverables/victoria/puppet-senlin.yaml index 51aba2ae87..7f335810c4 100644 --- a/deliverables/victoria/puppet-senlin.yaml +++ b/deliverables/victoria/puppet-senlin.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-senlin -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-senlin: {} diff --git a/deliverables/victoria/puppet-swift.yaml b/deliverables/victoria/puppet-swift.yaml index 4cefec026a..fe4421ec1e 100644 --- a/deliverables/victoria/puppet-swift.yaml +++ b/deliverables/victoria/puppet-swift.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-swift -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-swift: {} diff --git a/deliverables/victoria/puppet-tacker.yaml b/deliverables/victoria/puppet-tacker.yaml index 1bf5233600..9e2abb9026 100644 --- a/deliverables/victoria/puppet-tacker.yaml +++ b/deliverables/victoria/puppet-tacker.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-tacker -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-tacker: {} diff --git a/deliverables/victoria/puppet-tempest.yaml b/deliverables/victoria/puppet-tempest.yaml index b68ca1650c..2ea11984c7 100644 --- a/deliverables/victoria/puppet-tempest.yaml +++ b/deliverables/victoria/puppet-tempest.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-tempest -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-tempest: {} diff --git a/deliverables/victoria/puppet-tripleo.yaml b/deliverables/victoria/puppet-tripleo.yaml index e54063587a..fca18f7fe3 100644 --- a/deliverables/victoria/puppet-tripleo.yaml +++ b/deliverables/victoria/puppet-tripleo.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: tripleo -type: other +type: trailing repository-settings: openstack/puppet-tripleo: {} diff --git a/deliverables/victoria/puppet-trove.yaml b/deliverables/victoria/puppet-trove.yaml index ca93bff6c4..e5a39bce1a 100644 --- a/deliverables/victoria/puppet-trove.yaml +++ b/deliverables/victoria/puppet-trove.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-trove -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-trove: {} diff --git a/deliverables/victoria/puppet-vitrage.yaml b/deliverables/victoria/puppet-vitrage.yaml index b615b85a43..eebade4a45 100644 --- a/deliverables/victoria/puppet-vitrage.yaml +++ b/deliverables/victoria/puppet-vitrage.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-vitrage -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-vitrage: {} diff --git a/deliverables/victoria/puppet-vswitch.yaml b/deliverables/victoria/puppet-vswitch.yaml index fbbd2440c6..263bd09ee8 100644 --- a/deliverables/victoria/puppet-vswitch.yaml +++ b/deliverables/victoria/puppet-vswitch.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-vswitch -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-vswitch: {} diff --git a/deliverables/victoria/puppet-watcher.yaml b/deliverables/victoria/puppet-watcher.yaml index b7d67c8d97..56e1731b31 100644 --- a/deliverables/victoria/puppet-watcher.yaml +++ b/deliverables/victoria/puppet-watcher.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-watcher -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-watcher: {} diff --git a/deliverables/victoria/puppet-zaqar.yaml b/deliverables/victoria/puppet-zaqar.yaml index eb016dee2f..c0ff80c1c8 100644 --- a/deliverables/victoria/puppet-zaqar.yaml +++ b/deliverables/victoria/puppet-zaqar.yaml @@ -1,7 +1,7 @@ --- launchpad: puppet-zaqar -release-model: cycle-trailing +release-model: cycle-with-intermediary team: Puppet OpenStack -type: other +type: trailing repository-settings: openstack/puppet-zaqar: {} diff --git a/deliverables/victoria/python-tripleoclient.yaml b/deliverables/victoria/python-tripleoclient.yaml index 28c13c9768..be6a60fe3f 100644 --- a/deliverables/victoria/python-tripleoclient.yaml +++ b/deliverables/victoria/python-tripleoclient.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: client-library +type: trailing repository-settings: openstack/python-tripleoclient: {} diff --git a/deliverables/victoria/tripleo-ansible.yaml b/deliverables/victoria/tripleo-ansible.yaml index dfd9779c16..13e3e1b3ce 100644 --- a/deliverables/victoria/tripleo-ansible.yaml +++ b/deliverables/victoria/tripleo-ansible.yaml @@ -1,8 +1,8 @@ --- artifact-link-mode: none launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-ansible: {} diff --git a/deliverables/victoria/tripleo-common.yaml b/deliverables/victoria/tripleo-common.yaml index 30c54ed2dd..568b8e09cf 100644 --- a/deliverables/victoria/tripleo-common.yaml +++ b/deliverables/victoria/tripleo-common.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo-common -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-common: {} diff --git a/deliverables/victoria/tripleo-heat-templates.yaml b/deliverables/victoria/tripleo-heat-templates.yaml index 801be5696b..6a23b9f1dd 100644 --- a/deliverables/victoria/tripleo-heat-templates.yaml +++ b/deliverables/victoria/tripleo-heat-templates.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-heat-templates: {} diff --git a/deliverables/victoria/tripleo-image-elements.yaml b/deliverables/victoria/tripleo-image-elements.yaml index b1f4646248..7716fc38a9 100644 --- a/deliverables/victoria/tripleo-image-elements.yaml +++ b/deliverables/victoria/tripleo-image-elements.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-image-elements: {} diff --git a/deliverables/victoria/tripleo-ipsec.yaml b/deliverables/victoria/tripleo-ipsec.yaml index b56bb6613d..db25e34a1f 100644 --- a/deliverables/victoria/tripleo-ipsec.yaml +++ b/deliverables/victoria/tripleo-ipsec.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-ipsec: {} diff --git a/deliverables/victoria/tripleo-puppet-elements.yaml b/deliverables/victoria/tripleo-puppet-elements.yaml index 1235e23ae9..d58b50abc7 100644 --- a/deliverables/victoria/tripleo-puppet-elements.yaml +++ b/deliverables/victoria/tripleo-puppet-elements.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-puppet-elements: {} diff --git a/deliverables/victoria/tripleo-validations.yaml b/deliverables/victoria/tripleo-validations.yaml index ce4f548d19..ce8fbcfaa3 100644 --- a/deliverables/victoria/tripleo-validations.yaml +++ b/deliverables/victoria/tripleo-validations.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/tripleo-validations: {} diff --git a/deliverables/victoria/validations-common.yaml b/deliverables/victoria/validations-common.yaml index cf31a0d1be..2265817532 100644 --- a/deliverables/victoria/validations-common.yaml +++ b/deliverables/victoria/validations-common.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/validations-common: {} diff --git a/deliverables/victoria/validations-libs.yaml b/deliverables/victoria/validations-libs.yaml index 787c236fdc..7f30d506d6 100644 --- a/deliverables/victoria/validations-libs.yaml +++ b/deliverables/victoria/validations-libs.yaml @@ -1,8 +1,8 @@ --- launchpad: tripleo -release-model: cycle-trailing +release-model: cycle-with-intermediary release-type: python-pypi team: tripleo -type: other +type: trailing repository-settings: openstack/validations-libs: {} diff --git a/doc/source/_exts/deliverables.py b/doc/source/_exts/deliverables.py index 25fa1a9410..57ecebe0d4 100644 --- a/doc/source/_exts/deliverables.py +++ b/doc/source/_exts/deliverables.py @@ -69,7 +69,7 @@ def _list_table(add, headers, data, title='', columns=None): def _get_category(deliv): model = deliv.model if model == 'cycle-trailing': - return 'cycle-trailing' + return 'trailing' if model == 'abandoned': return 'abandoned' return deliv.type @@ -103,7 +103,7 @@ class DeliverableDirectiveBase(rst.Directive): 'library', 'horizon-plugin', 'other', - 'cycle-trailing', + 'trailing', 'tempest-plugin', 'abandoned', ] @@ -196,7 +196,7 @@ class DeliverableDirectiveBase(rst.Directive): 'library': 'Library Projects', 'client-library': 'Service Client Projects', 'other': 'Other Projects', - 'cycle-trailing': 'Deployment and Packaging Tools', + 'trailing': 'Deployment and Packaging Tools', 'tempest-plugin': 'Tempest Plugins', 'abandoned': 'End-of-life deliverables', } diff --git a/doc/source/reference/deliverable_types.rst b/doc/source/reference/deliverable_types.rst index 207d96544b..b0e65dd5c4 100644 --- a/doc/source/reference/deliverable_types.rst +++ b/doc/source/reference/deliverable_types.rst @@ -2,17 +2,19 @@ Deliverable Types =================== -.. _`type-horizon-plugin`: +The type of a deliverable affects in which section it is listed on +the releases.openstack.org website, as well as which deadline applies +to it within a development cycle. -horizon-plugin -============== +.. _`type-service`: -This deliverable type indicates that a deliverable is meant to be -consumed by Horizon as a plug-in, to provide an integrated web UI for -a given project. +service +======= -* The repository contains code meant to be dynamically loaded by - OpenStack Horizon to provide UI to specific projects. +This deliverable type indicates that a project provides a user-facing +long-running service with a REST API. The deadline for producing such +a deliverable in a development cycle is the 'Final RCs and intermediary +releases' week, usually located at R-1. .. _`type-library`: @@ -22,7 +24,9 @@ library This deliverable type indicates that a project is a library, middleware, or other piece of software that is used to build another project and does not, by itself, provide a long-running -service or stand-alone tool. +service or stand-alone tool. The deadline for producing such a +deliverable in a development cycle is the 'Final release for +non-client libraries' week, usually located at R-6. * The repository contains software used as a library for the loose and commonly-understood definition of "library". @@ -35,15 +39,33 @@ client-library This deliverable type indicates that a project is a library containing a client for an OpenStack service that is intended to be consumed by other OpenStack services (so not a general-purpose user client such as -``shade``). +``shade``). The deadline for producing such a deliverable in a development +cycle is the 'Final release for client libraries' week, usually located +at R-5. -.. _`type-service`: +.. _`type-horizon-plugin`: -service -======= +horizon-plugin +============== -This deliverable type indicates that a project provides a user-facing -long-running service with a REST API. +This deliverable type indicates that a deliverable is meant to be +consumed by Horizon as a plug-in, to provide an integrated web UI for +a given project. The deadline for producing such a deliverable in a +development cycle is the 'Final RCs and intermediary releases' week, +usually located at R-1. + +* The repository contains code meant to be dynamically loaded by + OpenStack Horizon to provide UI to specific projects. + +.. _`type-trailing`: + +trailing +======== + +This deliverable type indicates that a deliverable is a deployment tool +or some other tool that builds on top of an existing release. The deadline +for producing such a deliverable in a development cycle is the 'cycle-trailing +Release Deadline', usually located 3 months after the coordinated release. .. _`type-other`: @@ -51,4 +73,6 @@ other ===== Deliverables without a more specific categorization are listed as -``other``. +``other``. The deadline for producing such a deliverable in a development +cycle is the 'Final RCs and intermediary releases' week, usually located +at R-1. diff --git a/doc/source/reference/process.rst b/doc/source/reference/process.rst index a8a165bcbe..25a302b82f 100644 --- a/doc/source/reference/process.rst +++ b/doc/source/reference/process.rst @@ -91,7 +91,7 @@ Week before milestone-1 the command:: tox -e venv -- list-deliverables --series $LASTSERIES \ - --model cycle-trailing --missing-final + --type trailing --missing-final #. At the end of the week, send the following weekly email content:: diff --git a/doc/source/reference/release_models.rst b/doc/source/reference/release_models.rst index 792706c3fb..54802a8ea9 100644 --- a/doc/source/reference/release_models.rst +++ b/doc/source/reference/release_models.rst @@ -3,37 +3,44 @@ ================ Development in OpenStack is organized around 6-month cycles (like -"kilo"). At the end of every 6-month cycle a number of projects -release at the same time, providing a convenient reference point for -downstream teams (stable branch maintenance, vulnerability management) -and downstream users (in particular packagers of OpenStack -distributions). +"kilo"). At the end of every 6-month cycle, a synchronized release +of all OpenStack components is produced, along with a common stable +branch, providing a convenient reference point for downstream teams +(stable branch maintenance, vulnerability management) and downstream +users (in particular packagers of OpenStack distributions). -This "final" release may be the only release of the development cycle, -in which case the project publishes intermediary "development -milestones" on a time-based schedule during the cycle. Or the project -may release more often and make intermediary releases in the middle of -the cycle. Other projects trail the main release deadline, waiting for -the final releases of components on which they rely. +Most deliverables follow the cycle. If their "final" release is their +only release of the development cycle, they can produce release +candidates in the final stages of the release cycle (`cycle-with-rc`_ +release model). Otherwise they can opt to release directly and +whenever appropriate (`cycle-with-intermediary`_ release model). -A given deliverable can't have more than one model. It therefore must -choose between one of the following models. A number of rules apply -based on what the deliverable is and which bucket of the OpenStack map -it falls in: +The deadline for producing this "final" release varies depending on +the type of the deliverable. In a development cycle, non-client +libraries ("library" type) are first, then client libraries +("client-library" type), then services and other main deliverables +("service" and "other" types), then release-trailing deliverables +("trailing" type). + +Finally, some deliverables that are generally useful and not strictly +tied to the OpenStack development cycle can release independently +from it using the `independent`_ release model. + +A number of rules apply based on what the deliverable is and which +bucket of the OpenStack map it falls in: * Components appearing in the *openstack* bucket in the `OpenStack map`_ - form the main components of an OpenStack cloud, and therefore should follow + form the main components of an OpenStack cloud, and therefore must follow the release cycle. They need to pick between `cycle-with-rc`_ or `cycle-with-intermediary`_ models. -* Libraries cannot use RCs or trail the release. They need to pick between +* Libraries cannot use RCs. They need to pick between `cycle-with-intermediary`_ and `independent`_ release models. Libraries with strong ties to OpenStack should prefer the `cycle-with-intermediary`_ model, while generally-useful libraries should prefer the `independent`_ model. -* Only deployment or lifecycle-management components are allowed to trail - the cycle. Therefore only components appearing in the - *openstack-lifecyclemanagement* bucket on the `OpenStack map`_ are - allowed to use the `cycle-trailing`_ model. +* Trailing deliverables trail the release, so they cannot, by definition, + be independent. They need to pick between `cycle-with-rc`_ or + `cycle-with-intermediary`_ models. .. _`OpenStack map`: https://www.openstack.org/openstack-map @@ -55,37 +62,6 @@ per-project need. * Release tags for deliverables using this tag are reviewed and applied by the Release Management team. -.. _cycle-with-milestones: - -cycle-with-milestones (legacy) -============================== - -.. note:: - - The cycle-with-milestones release model is no longer used and is kept here - for historical reference. Projects should now use cycle-with-rc. - - -The "cycle-with-milestones" model described projects that produced a -single release at the end of the cycle, with development milestones -published at predetermined times in the cycle schedule. - -* "cycle-with-milestones" projects committed to publish development - milestones following a predetermined schedule published by the Release - Management team before the start of the 6-month cycle. -* "cycle-with-milestones" projects committed to produce a release to - match the end of the 6-month development cycle. -* Release tags for deliverables using this tag were reviewed and - applied by the Release Management team. -* Projects using milestones were expected to tag at least 2 out of the - 3 for each cycle, or risk being dropped as an official project. The - release team would remind projects that miss the first milestone, and - create tags on any later milestones for the project team by tagging - HEAD at the time of the deadline. If the release team force-created - 2 tags for a project in the same given development cycle, the - project would be treated as inactive and the release team would - recommend dropping it from the official project list. - .. _cycle-with-intermediary: cycle-with-intermediary @@ -102,21 +78,6 @@ release to match the end of the cycle. * Release tags for deliverables using this tag are reviewed and applied by the Release Management team. -.. _cycle-trailing: - -cycle-trailing -============== - -The "cycle-trailing" model is used by projects producing OpenStack -packaging, installation recipes or lifecycle management tools. Those -still do one release for every development cycle, but they can't -release until OpenStack itself is released. - -* "cycle-trailing" projects commit to produce a release no later than - 3 months after the main release. -* Release tags for deliverables using this tag are reviewed and - applied by the Release Management team. - .. _cycle-automatic: cycle-automatic @@ -214,3 +175,61 @@ Projects created or added to governance after the second milestone should be released using the independent release model, and then changed to one of the cycle-based models at the start of the next cycle. + +Legacy release models +===================== + +Those models were available in previous development cycles, but were +replaced or abandoned. + +.. _cycle-trailing: + +cycle-trailing +-------------- + +.. note:: + + The cycle-trailing release model has been replaced by a specific + "trailing" deliverable type that can be applied to cycle-with-rc + or cycle-with-intermediary release models. + +The "cycle-trailing" model was used by projects producing OpenStack +packaging, installation recipes or lifecycle management tools. Those +still do one release for every development cycle, but they can't +release until OpenStack itself is released. + +* "cycle-trailing" projects commit to produce a release no later than + 3 months after the main release. +* Release tags for deliverables using this tag are reviewed and + applied by the Release Management team. + + +.. _cycle-with-milestones: + +cycle-with-milestones +--------------------- + +.. note:: + + The cycle-with-milestones release model has been replaced by the + cycle-with-rc model. + +The "cycle-with-milestones" model described projects that produced a +single release at the end of the cycle, with development milestones +published at predetermined times in the cycle schedule. + +* "cycle-with-milestones" projects committed to publish development + milestones following a predetermined schedule published by the Release + Management team before the start of the 6-month cycle. +* "cycle-with-milestones" projects committed to produce a release to + match the end of the 6-month development cycle. +* Release tags for deliverables using this tag were reviewed and + applied by the Release Management team. +* Projects using milestones were expected to tag at least 2 out of the + 3 for each cycle, or risk being dropped as an official project. The + release team would remind projects that miss the first milestone, and + create tags on any later milestones for the project team by tagging + HEAD at the time of the deadline. If the release team force-created + 2 tags for a project in the same given development cycle, the + project would be treated as inactive and the release team would + recommend dropping it from the official project list. diff --git a/doc/source/reference/using.rst b/doc/source/reference/using.rst index 9e4bffd170..f06beb3f53 100644 --- a/doc/source/reference/using.rst +++ b/doc/source/reference/using.rst @@ -255,8 +255,7 @@ that deliverable. For each deliverable, we need to track: * cycle highlights that will be published to ``releases.openstack.org/$SERIES/highlights.html`` (optional, and for - cycle-with-intermediary, cycle-with-rc, and cycle-trailing projects - only) + cycle-with-intermediary and cycle-with-rc projects only) * the starting points of all branches We track this metadata for the history of all releases of the diff --git a/openstack_releases/cmds/list_deliverables.py b/openstack_releases/cmds/list_deliverables.py index c47de856c3..bc709c0223 100644 --- a/openstack_releases/cmds/list_deliverables.py +++ b/openstack_releases/cmds/list_deliverables.py @@ -91,13 +91,13 @@ def main(): '--cycle-based', action='store_true', default=False, - help='include all cycle-based code repositories', + help='include all cycle-based deliverables', ) model.add_argument( '--cycle-based-no-trailing', action='store_true', default=False, - help='include all cycle-based code repositories except cycle-trailing', + help='include all cycle-based deliverables, except trailing ones', ) parser.add_argument( '--type', @@ -218,7 +218,7 @@ def main(): if args.cycle_based and not deliv.is_cycle_based: continue if args.cycle_based_no_trailing and (not deliv.is_cycle_based or - deliv.model == 'cycle-trailing'): + deliv.type == 'trailing'): continue if args.type and deliv.type not in args.type: continue diff --git a/openstack_releases/cmds/propose_final_releases.py b/openstack_releases/cmds/propose_final_releases.py index a76c07cfbd..f93ef74c1d 100644 --- a/openstack_releases/cmds/propose_final_releases.py +++ b/openstack_releases/cmds/propose_final_releases.py @@ -78,7 +78,7 @@ def main(): '--all', default=False, action='store_true', - help='process all deliverables, including release:cycle-trailing', + help='process all deliverables, including cycle-trailing ones', ) parser.add_argument( '--verbose', '-v', @@ -150,7 +150,7 @@ def main(): verbose('\n{} {}'.format(deliv.name, deliv.model)) - if deliv.model == 'cycle-trailing': + if (deliv.model == 'cycle-trailing' or deliv.type == 'trailing'): verbose('# {} is a cycle-trailing project'.format( deliv.name)) if not args.all: diff --git a/openstack_releases/cmds/propose_library_branches.py b/openstack_releases/cmds/propose_library_branches.py index c37556a9bd..21e8d5a01b 100644 --- a/openstack_releases/cmds/propose_library_branches.py +++ b/openstack_releases/cmds/propose_library_branches.py @@ -59,9 +59,9 @@ def main(): parser.add_argument( '--include-trailing', action='append_const', - const='cycle-trailing', - default=['cycle-with-intermediary'], - dest='models', + const='trailing', + default=['library'], + dest='types', ) parser.add_argument( '--dry-run', '-n', @@ -113,7 +113,7 @@ def main(): deliverable_data = yamlutils.loads(f.read()) if deliverable_data['type'] not in args.types: continue - if deliverable_data['release-model'] not in args.models: + if deliverable_data['release-model'] != 'cycle-with-intermediary': print('WARNING {} has release model {}, skipping'.format( deliverable_name, deliverable_data['release-model'])) continue diff --git a/openstack_releases/deliverable.py b/openstack_releases/deliverable.py index 8f2edaed5d..da5f22e36d 100644 --- a/openstack_releases/deliverable.py +++ b/openstack_releases/deliverable.py @@ -500,6 +500,8 @@ class Deliverable(object): def type(self): if 'tempest-plugin' in self.name: return 'tempest-plugin' + if self.model == 'cycle-trailing': + return 'trailing' return self._data.get('type', 'other') @property diff --git a/openstack_releases/schema.yaml b/openstack_releases/schema.yaml index e02ca20dc2..eb0a5923fb 100644 --- a/openstack_releases/schema.yaml +++ b/openstack_releases/schema.yaml @@ -33,7 +33,7 @@ properties: enum: ["cycle-with-intermediary", "cycle-with-milestones", "cycle-trailing", "untagged", "cycle-with-rc", "cycle-automatic", "abandoned"] type: type: "string" - enum: ["horizon-plugin", "library", "client-library", "service", "tempest-plugin", "other"] + enum: ["horizon-plugin", "library", "client-library", "service", "tempest-plugin", "other", "trailing"] artifact-link-mode: type: "string" enum: ["tarball", "none"]