Merge "cycle-automatic is just stable-branch-type: none"

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:

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:

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: {}

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:

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: {}

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: {}

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: {}

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: {}

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:

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: {}

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: {}

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:

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: {}

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:

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:

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:

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: {}

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: {}

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:

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: {}

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: {}

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: {}

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: {}

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: {}

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:

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: {}

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:

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: {}

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:

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:

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:

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

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: