From 309e95eaad04f76c260e8645967f2d58f85dc7d9 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Tue, 16 Jun 2020 17:20:32 +0200 Subject: [PATCH] cycle-automatic is just stable-branch-type: none Now that releases are systematically proposed for deliverables with changes at the end of a cycle, the cycle-automatic release model is really better described with cycle-with-intermediary combined with the 'stable-branch-type: none' option. Change-Id: Ia9c5dadcaa89fbbdb7420a52cc3fed665e4ba513 --- .../victoria/barbican-tempest-plugin.yaml | 3 +- .../victoria/blazar-tempest-plugin.yaml | 3 +- .../victoria/cinder-tempest-plugin.yaml | 3 +- .../victoria/cloudkitty-tempest-plugin.yaml | 3 +- .../victoria/congress-tempest-plugin.yaml | 3 +- .../victoria/cyborg-tempest-plugin.yaml | 3 +- .../victoria/designate-tempest-plugin.yaml | 3 +- .../victoria/ec2api-tempest-plugin.yaml | 3 +- .../victoria/freezer-tempest-plugin.yaml | 3 +- .../victoria/heat-tempest-plugin.yaml | 3 +- .../victoria/ironic-tempest-plugin.yaml | 3 +- .../victoria/keystone-tempest-plugin.yaml | 3 +- .../victoria/kuryr-tempest-plugin.yaml | 1 + .../victoria/magnum-tempest-plugin.yaml | 3 +- .../victoria/manila-tempest-plugin.yaml | 3 +- .../victoria/mistral-tempest-plugin.yaml | 3 +- .../victoria/monasca-tempest-plugin.yaml | 3 +- .../victoria/murano-tempest-plugin.yaml | 3 +- .../victoria/neutron-tempest-plugin.yaml | 3 +- .../victoria/octavia-tempest-plugin.yaml | 3 +- .../victoria/oswin-tempest-plugin.yaml | 3 +- deliverables/victoria/sahara-tests.yaml | 3 +- .../victoria/senlin-tempest-plugin.yaml | 3 +- .../victoria/solum-tempest-plugin.yaml | 3 +- .../victoria/telemetry-tempest-plugin.yaml | 3 +- deliverables/victoria/tempest-horizon.yaml | 3 +- .../victoria/trove-tempest-plugin.yaml | 3 +- .../victoria/vitrage-tempest-plugin.yaml | 3 +- .../victoria/watcher-tempest-plugin.yaml | 3 +- .../victoria/zaqar-tempest-plugin.yaml | 3 +- deliverables/victoria/zun-tempest-plugin.yaml | 3 +- doc/source/reference/process.rst | 12 ++---- doc/source/reference/release_models.rst | 39 +++++++++++-------- 33 files changed, 86 insertions(+), 56 deletions(-) diff --git a/deliverables/victoria/barbican-tempest-plugin.yaml b/deliverables/victoria/barbican-tempest-plugin.yaml index 551fa6ee58..6e667f09ad 100644 --- a/deliverables/victoria/barbican-tempest-plugin.yaml +++ b/deliverables/victoria/barbican-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: barbican -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/barbican-tempest-plugin: diff --git a/deliverables/victoria/blazar-tempest-plugin.yaml b/deliverables/victoria/blazar-tempest-plugin.yaml index d6681a520b..8013652418 100644 --- a/deliverables/victoria/blazar-tempest-plugin.yaml +++ b/deliverables/victoria/blazar-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: blazar -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/blazar-tempest-plugin: diff --git a/deliverables/victoria/cinder-tempest-plugin.yaml b/deliverables/victoria/cinder-tempest-plugin.yaml index 02635405ad..0fa3cb3c39 100644 --- a/deliverables/victoria/cinder-tempest-plugin.yaml +++ b/deliverables/victoria/cinder-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: cinder -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/cinder-tempest-plugin: {} diff --git a/deliverables/victoria/cloudkitty-tempest-plugin.yaml b/deliverables/victoria/cloudkitty-tempest-plugin.yaml index dca7acf7c0..52d33791d8 100644 --- a/deliverables/victoria/cloudkitty-tempest-plugin.yaml +++ b/deliverables/victoria/cloudkitty-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false storyboard: openstack/cloudkitty-tempest-plugin -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/cloudkitty-tempest-plugin: diff --git a/deliverables/victoria/congress-tempest-plugin.yaml b/deliverables/victoria/congress-tempest-plugin.yaml index b87cc53ad9..fc5d0a9142 100644 --- a/deliverables/victoria/congress-tempest-plugin.yaml +++ b/deliverables/victoria/congress-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: congress -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/congress-tempest-plugin: {} diff --git a/deliverables/victoria/cyborg-tempest-plugin.yaml b/deliverables/victoria/cyborg-tempest-plugin.yaml index 3d09646c90..05a4bc7431 100644 --- a/deliverables/victoria/cyborg-tempest-plugin.yaml +++ b/deliverables/victoria/cyborg-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false storyboard: openstack/cyborg -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/cyborg-tempest-plugin: {} diff --git a/deliverables/victoria/designate-tempest-plugin.yaml b/deliverables/victoria/designate-tempest-plugin.yaml index 16c8eb0c83..2c47a0acef 100644 --- a/deliverables/victoria/designate-tempest-plugin.yaml +++ b/deliverables/victoria/designate-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: designate -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/designate-tempest-plugin: {} diff --git a/deliverables/victoria/ec2api-tempest-plugin.yaml b/deliverables/victoria/ec2api-tempest-plugin.yaml index 42986ee62e..dc66728ac1 100644 --- a/deliverables/victoria/ec2api-tempest-plugin.yaml +++ b/deliverables/victoria/ec2api-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: ec2-api -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/ec2api-tempest-plugin: {} diff --git a/deliverables/victoria/freezer-tempest-plugin.yaml b/deliverables/victoria/freezer-tempest-plugin.yaml index 922edb64ca..1bc2943994 100644 --- a/deliverables/victoria/freezer-tempest-plugin.yaml +++ b/deliverables/victoria/freezer-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: freezer -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/freezer-tempest-plugin: diff --git a/deliverables/victoria/heat-tempest-plugin.yaml b/deliverables/victoria/heat-tempest-plugin.yaml index 85b4e2ff63..66fbc85109 100644 --- a/deliverables/victoria/heat-tempest-plugin.yaml +++ b/deliverables/victoria/heat-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: heat -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/heat-tempest-plugin: {} diff --git a/deliverables/victoria/ironic-tempest-plugin.yaml b/deliverables/victoria/ironic-tempest-plugin.yaml index f9db014a3b..357cfed718 100644 --- a/deliverables/victoria/ironic-tempest-plugin.yaml +++ b/deliverables/victoria/ironic-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false storyboard: openstack/ironic -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/ironic-tempest-plugin: {} diff --git a/deliverables/victoria/keystone-tempest-plugin.yaml b/deliverables/victoria/keystone-tempest-plugin.yaml index 0d8ad937ed..c66081f177 100644 --- a/deliverables/victoria/keystone-tempest-plugin.yaml +++ b/deliverables/victoria/keystone-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: keystone -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/keystone-tempest-plugin: diff --git a/deliverables/victoria/kuryr-tempest-plugin.yaml b/deliverables/victoria/kuryr-tempest-plugin.yaml index 34f352b2cf..d6a3f03dc1 100644 --- a/deliverables/victoria/kuryr-tempest-plugin.yaml +++ b/deliverables/victoria/kuryr-tempest-plugin.yaml @@ -2,6 +2,7 @@ include-pypi-link: false launchpad: kuryr release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/kuryr-tempest-plugin: {} diff --git a/deliverables/victoria/magnum-tempest-plugin.yaml b/deliverables/victoria/magnum-tempest-plugin.yaml index 7b5dde3cb0..cd4312e702 100644 --- a/deliverables/victoria/magnum-tempest-plugin.yaml +++ b/deliverables/victoria/magnum-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: magnum -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/magnum-tempest-plugin: diff --git a/deliverables/victoria/manila-tempest-plugin.yaml b/deliverables/victoria/manila-tempest-plugin.yaml index adc941d8fe..61bfc782b5 100644 --- a/deliverables/victoria/manila-tempest-plugin.yaml +++ b/deliverables/victoria/manila-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: manila -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/manila-tempest-plugin: diff --git a/deliverables/victoria/mistral-tempest-plugin.yaml b/deliverables/victoria/mistral-tempest-plugin.yaml index 5a6e3cbbd2..6e83b3fefd 100644 --- a/deliverables/victoria/mistral-tempest-plugin.yaml +++ b/deliverables/victoria/mistral-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: mistral -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/mistral-tempest-plugin: diff --git a/deliverables/victoria/monasca-tempest-plugin.yaml b/deliverables/victoria/monasca-tempest-plugin.yaml index 9aa2ceb450..5eb755450c 100644 --- a/deliverables/victoria/monasca-tempest-plugin.yaml +++ b/deliverables/victoria/monasca-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- launchpad: monasca include-pypi-link: false -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/monasca-tempest-plugin: {} diff --git a/deliverables/victoria/murano-tempest-plugin.yaml b/deliverables/victoria/murano-tempest-plugin.yaml index 72d0dbf6e6..d5407f61a2 100644 --- a/deliverables/victoria/murano-tempest-plugin.yaml +++ b/deliverables/victoria/murano-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: murano -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/murano-tempest-plugin: {} diff --git a/deliverables/victoria/neutron-tempest-plugin.yaml b/deliverables/victoria/neutron-tempest-plugin.yaml index 575630bbf4..67e47c7381 100644 --- a/deliverables/victoria/neutron-tempest-plugin.yaml +++ b/deliverables/victoria/neutron-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: neutron -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/neutron-tempest-plugin: diff --git a/deliverables/victoria/octavia-tempest-plugin.yaml b/deliverables/victoria/octavia-tempest-plugin.yaml index 316bed2088..f55882ec72 100644 --- a/deliverables/victoria/octavia-tempest-plugin.yaml +++ b/deliverables/victoria/octavia-tempest-plugin.yaml @@ -1,6 +1,7 @@ --- include-pypi-link: false -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/octavia-tempest-plugin: {} diff --git a/deliverables/victoria/oswin-tempest-plugin.yaml b/deliverables/victoria/oswin-tempest-plugin.yaml index 792b9dd3ad..04441a11af 100644 --- a/deliverables/victoria/oswin-tempest-plugin.yaml +++ b/deliverables/victoria/oswin-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- launchpad: os-win include-pypi-link: false -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/oswin-tempest-plugin: {} diff --git a/deliverables/victoria/sahara-tests.yaml b/deliverables/victoria/sahara-tests.yaml index 9e03c97452..96f25fa11d 100644 --- a/deliverables/victoria/sahara-tests.yaml +++ b/deliverables/victoria/sahara-tests.yaml @@ -2,7 +2,8 @@ team: sahara type: tempest-plugin storyboard: 940 -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/sahara-tests: {} diff --git a/deliverables/victoria/senlin-tempest-plugin.yaml b/deliverables/victoria/senlin-tempest-plugin.yaml index b19ca8297f..3966ffe1d8 100644 --- a/deliverables/victoria/senlin-tempest-plugin.yaml +++ b/deliverables/victoria/senlin-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: senlin -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/senlin-tempest-plugin: {} diff --git a/deliverables/victoria/solum-tempest-plugin.yaml b/deliverables/victoria/solum-tempest-plugin.yaml index 927965a029..a79beb7e3d 100644 --- a/deliverables/victoria/solum-tempest-plugin.yaml +++ b/deliverables/victoria/solum-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: solum -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/solum-tempest-plugin: {} diff --git a/deliverables/victoria/telemetry-tempest-plugin.yaml b/deliverables/victoria/telemetry-tempest-plugin.yaml index d0f14208a5..f3aee22c46 100644 --- a/deliverables/victoria/telemetry-tempest-plugin.yaml +++ b/deliverables/victoria/telemetry-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- launchpad: ceilometer include-pypi-link: false -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/telemetry-tempest-plugin: diff --git a/deliverables/victoria/tempest-horizon.yaml b/deliverables/victoria/tempest-horizon.yaml index f6a6c51b65..dcea13381a 100644 --- a/deliverables/victoria/tempest-horizon.yaml +++ b/deliverables/victoria/tempest-horizon.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: horizon -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/tempest-horizon: {} diff --git a/deliverables/victoria/trove-tempest-plugin.yaml b/deliverables/victoria/trove-tempest-plugin.yaml index 350cfd88ff..a8d73b2e23 100644 --- a/deliverables/victoria/trove-tempest-plugin.yaml +++ b/deliverables/victoria/trove-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: trove -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/trove-tempest-plugin: diff --git a/deliverables/victoria/vitrage-tempest-plugin.yaml b/deliverables/victoria/vitrage-tempest-plugin.yaml index fe50f88c1f..dd41e3311f 100644 --- a/deliverables/victoria/vitrage-tempest-plugin.yaml +++ b/deliverables/victoria/vitrage-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: vitrage -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/vitrage-tempest-plugin: {} diff --git a/deliverables/victoria/watcher-tempest-plugin.yaml b/deliverables/victoria/watcher-tempest-plugin.yaml index 2100509f1b..1656b05847 100644 --- a/deliverables/victoria/watcher-tempest-plugin.yaml +++ b/deliverables/victoria/watcher-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: watcher -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/watcher-tempest-plugin: diff --git a/deliverables/victoria/zaqar-tempest-plugin.yaml b/deliverables/victoria/zaqar-tempest-plugin.yaml index 22728263fa..76bc590bdf 100644 --- a/deliverables/victoria/zaqar-tempest-plugin.yaml +++ b/deliverables/victoria/zaqar-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: zaqar -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/zaqar-tempest-plugin: diff --git a/deliverables/victoria/zun-tempest-plugin.yaml b/deliverables/victoria/zun-tempest-plugin.yaml index b849ec36d9..a53b62e800 100644 --- a/deliverables/victoria/zun-tempest-plugin.yaml +++ b/deliverables/victoria/zun-tempest-plugin.yaml @@ -1,7 +1,8 @@ --- include-pypi-link: false launchpad: zun -release-model: cycle-automatic +release-model: cycle-with-intermediary +stable-branch-type: none release-type: python-pypi repository-settings: openstack/zun-tempest-plugin: diff --git a/doc/source/reference/process.rst b/doc/source/reference/process.rst index 25a302b82f..c1d38d7da8 100644 --- a/doc/source/reference/process.rst +++ b/doc/source/reference/process.rst @@ -971,8 +971,9 @@ R-3 week (RC1 deadline) needs to have a RC1 anyway for preparing the final release. - cycle-with-intermediary deliverables that have not released yet, for - which a release should be proposed from HEAD, and include stable branch - creation. You can list those using:: + which a release should be proposed from HEAD. Stable branch creation + should be included, unless the deliverable has specified the + 'stable-branch-type: none' option. You can list those using:: tox -e venv -- list-deliverables --unreleased \ --model cycle-with-intermediary \ @@ -984,13 +985,6 @@ R-3 week (RC1 deadline) tox -e venv -- list-deliverables --missing-rc --model cycle-with-rc - - cycle-automatic deliverables, for which a final release should be - proposed from HEAD (unless there is an existing release in the cycle - and no change was merged since). Those should **not** include stable - branch creation. You can list those using:: - - tox -e venv -- list-deliverables --model cycle-automatic - - Those patches will be used as a base to communicate with the team: if a team wants to wait for a specific patch to make it to the release, someone from the team can -1 the patch to have it held, or update diff --git a/doc/source/reference/release_models.rst b/doc/source/reference/release_models.rst index 54802a8ea9..3b8ab93a30 100644 --- a/doc/source/reference/release_models.rst +++ b/doc/source/reference/release_models.rst @@ -78,23 +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-automatic: - -cycle-automatic -=============== - -The "cycle-automatic" model is used by specific technical deliverables -that need to be automatically released once at the end of a cycle. -Those may, optionally, also be released in the middle of the cycle. -Those do not need a stable branch created. This may be applied only -to "tempest-plugin" or "other" deliverables. - -* "cycle-automatic" deliverables will be automatically released by the - release team once at the end of a cycle, using the current HEAD of the - repository. No stable branch will be automatically created. -* Release tags for deliverables using this model are reviewed and - applied by the Release Management team. - .. _independent: independent @@ -203,6 +186,28 @@ release until OpenStack itself is released. * Release tags for deliverables using this tag are reviewed and applied by the Release Management team. +.. _cycle-automatic: + +cycle-automatic +--------------- + +.. note:: + + The cycle-automatic release model is now better described by the + cycle-with-intermediary model combined with stable-branch-type: none + +The "cycle-automatic" model is used by specific technical deliverables +that need to be automatically released once at the end of a cycle. +Those may, optionally, also be released in the middle of the cycle. +Those do not need a stable branch created. This may be applied only +to "tempest-plugin" or "other" deliverables. + +* "cycle-automatic" deliverables will be automatically released by the + release team once at the end of a cycle, using the current HEAD of the + repository. No stable branch will be automatically created. +* Release tags for deliverables using this model are reviewed and + applied by the Release Management team. + .. _cycle-with-milestones: