From c6f2124ae5a3dcc67a28c5f675b84ebdca22e871 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Mon, 12 Mar 2018 17:23:05 +0100 Subject: [PATCH] Relax constraints around packaging/lifecycle projects There is no reason to impose a short deadline for packaging or lifecycle management projects that want to trail the release. Let's relax the constraints and accept that cycle-trailing releases can happen up to 3 months after the main components synchronized release. Additionally, the idea behind the membership check at milestone-2 is to protect packagers against late additions, not to prevent late-added packaging systems from doing a release. The new rules should also apply to Queens, so that OpenStack-Helm and LOCI can actually do a Queens packaging release, despite having been added post milestone-2. Change-Id: If997e6053af6e74bf6ce8755313346effca6b4e5 --- doc/source/queens/schedule.rst | 21 +++------------------ doc/source/queens/schedule.yaml | 11 ----------- doc/source/reference/release_models.rst | 19 ++++++++----------- doc/source/rocky/schedule.rst | 21 +++------------------ doc/source/rocky/schedule.yaml | 10 ---------- 5 files changed, 14 insertions(+), 68 deletions(-) diff --git a/doc/source/queens/schedule.rst b/doc/source/queens/schedule.rst index 45eed97b92..5a959c5175 100644 --- a/doc/source/queens/schedule.rst +++ b/doc/source/queens/schedule.rst @@ -170,7 +170,8 @@ considered part of the release. Projects made official after the second milestone, or which fail to produce milestone releases for at least one of the first and second milestones as well as the third milestone, are therefore not considered part of the release for the -cycle. +cycle. This does not apply to cycle-trailing packaging / lifecycle +management projects. .. _q-rc1: @@ -207,29 +208,13 @@ Queens release The Queens coordinated release will happen on 28 February 2018. -.. _q-trailing-ff: - -Queens cycle-trailing feature freeze ------------------------------------- - -The release deadline for projects using the release:cycle-trailing model that -follow the main release cycle. - -.. _q-trailing-rc: - -Queens cycle-trailing RC deadline ---------------------------------- - -The deadline for publishing a first release candidate for projects using the -release:cycle-trailing model that follow the main release cycle. - .. _q-trailing-release: Queens cycle-trailing release deadline -------------------------------------- The release deadline for projects using the release:cycle-trailing model that -follow the main release cycle. +follow the main release cycle is set to May 30th, 2018. .. _n-final-library-releases: diff --git a/doc/source/queens/schedule.yaml b/doc/source/queens/schedule.yaml index 9d6fa90c5d..faa9bdf201 100644 --- a/doc/source/queens/schedule.yaml +++ b/doc/source/queens/schedule.yaml @@ -128,7 +128,6 @@ cycle: x-project: - q-rc1 - q-hard-sf - - q-trailing-ff project-specific: - r-ptl-election - end: '2018-02-16' @@ -144,13 +143,3 @@ cycle: start: '2018-02-26' x-project: - q-release - - q-trailing-rc -- end: '2018-03-09' - name: R+1 - start: '2018-03-05' -- end: '2018-03-16' - name: R+2 - start: '2018-03-12' - x-project: - - q-trailing-release - diff --git a/doc/source/reference/release_models.rst b/doc/source/reference/release_models.rst index 1b5446d394..0213c71062 100644 --- a/doc/source/reference/release_models.rst +++ b/doc/source/reference/release_models.rst @@ -25,13 +25,13 @@ it falls in: form the main components of an OpenStack cloud, and therefore should follow the release cycle. They need to pick between `cycle-with-milestones`_ or `cycle-with-intermediary`_ models. +* Libraries cannot use RCs or trail the release. They need to pick between + `cycle-with-intermediary`_ and `independent`_ release models based on how + much they are tied to OpenStack or more generally-useful. * 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. -* Libraries cannot use RCs or trail the release. They need to pick between - `cycle-with-intermediary`_ and `independent`_ release models based on how - much they are tied to OpenStack or more generally-useful. .. _`OpenStack map`: https://www.openstack.org/openstack-map @@ -73,16 +73,13 @@ release to match the end of the cycle. cycle-trailing ============== -The "cycle-trailing" model describes projects that follow the release -cycle, but because they rely on the other projects being completed may -not always publish their final release at the same time as those -projects. +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 - 2 weeks after the end of the 6-month development cycle. -* Within the cycle, projects using this release model will produce - intermediate or milestone releases (adhering to the same regular - deadlines) leading up to their final release. + 3 months after the main release. * Release tags for deliverables using this tag are reviewed and applied by the Release Management team. diff --git a/doc/source/rocky/schedule.rst b/doc/source/rocky/schedule.rst index 781ac59b30..14434016d1 100644 --- a/doc/source/rocky/schedule.rst +++ b/doc/source/rocky/schedule.rst @@ -164,7 +164,8 @@ considered part of the release. Projects made official after the second milestone, or which fail to produce milestone releases for at least one of the first and second milestones as well as the third milestone, are therefore not considered part of the release for the -cycle. +cycle. This does not apply to cycle-trailing packaging / lifecycle +management projects. .. _r-rc1: @@ -201,29 +202,13 @@ Rocky release The Rocky coordinated release will happen on 30 August 2018. -.. _r-trailing-ff: - -Rocky cycle-trailing feature freeze ------------------------------------ - -The release deadline for projects using the release:cycle-trailing model that -follow the main release cycle. - -.. _r-trailing-rc: - -Rocky cycle-trailing RC deadline --------------------------------- - -The deadline for publishing a first release candidate for projects using the -release:cycle-trailing model that follow the main release cycle. - .. _r-trailing-release: Rocky cycle-trailing release deadline ------------------------------------- The release deadline for projects using the release:cycle-trailing model that -follow the main release cycle. +follow the main release cycle is set to November 28, 2018. Project-specific events diff --git a/doc/source/rocky/schedule.yaml b/doc/source/rocky/schedule.yaml index 3115a6facb..180bfca9e2 100644 --- a/doc/source/rocky/schedule.yaml +++ b/doc/source/rocky/schedule.yaml @@ -96,7 +96,6 @@ cycle: x-project: - r-rc1 - r-hard-sf - - r-trailing-ff - end: '2018-08-17' name: R-2 start: '2018-08-13' @@ -110,15 +109,6 @@ cycle: start: '2018-08-27' x-project: - r-release - - r-trailing-rc - - end: '2018-09-07' - name: R+1 - start: '2018-09-03' - - end: '2018-09-14' - name: R+2 - start: '2018-09-10' - x-project: - - r-trailing-release release-week: 2018-08-27 start-week: 2018-03-05