From d9310b2aa90e4c7dfe61e03b93168ab0c9f1f7eb Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 28 Jun 2023 20:30:56 +0200 Subject: [PATCH 1/4] Clarify that two releases will happen on two separate days, and clarify which one will happen first. --- docs/docsite/rst/roadmap/COLLECTIONS_8.rst | 5 +++++ docs/docsite/rst/roadmap/COLLECTIONS_9.rst | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst index 90713603ec4..890d1ccfefe 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst @@ -40,6 +40,11 @@ Release schedule Breaking changes will be introduced in Ansible 8.0.0, although we encourage the use of deprecation periods that will show up in at least one Ansible release before the breaking change happens, this is not guaranteed. +.. note:: + + When a prerelease of Ansible 8 happens in the same week as an Ansible 7 release, the Ansible 8 prerelease will happen on the day after the Ansible 7 release. + When a release of Ansible 8 happens in the same week as an Ansible 9 release, the Ansible 8 release will happen on the day after the Ansible 9 release. + Ansible minor releases ======================= diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst index 5fc6c4ef4e6..aeb20ef5546 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst @@ -40,6 +40,11 @@ Release schedule Breaking changes will be introduced in Ansible 9.0.0. We encourage the use of deprecation periods that give advance notice of breaking changes at least one Ansible release before they are introduced. However, deprecation notices are not guaranteed to take place. +.. note:: + + When a prerelease of Ansible 9 happens in the same week as an Ansible 8 release, the Ansible 9 prerelease will happen on the day after the Ansible 8 release. + When a release of Ansible 9 happens in the same week as an Ansible 10 release, the Ansible 9 release will happen on the day after the Ansible 10 release. + Planned major changes ===================== From e0f3841d8eac830122fb4d2215b4fe4ac3636e05 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 28 Jun 2023 20:36:21 +0200 Subject: [PATCH 2/4] Add note on general discretion. --- docs/docsite/rst/roadmap/COLLECTIONS_8.rst | 1 + docs/docsite/rst/roadmap/COLLECTIONS_9.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst index 890d1ccfefe..634037f57ce 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst @@ -44,6 +44,7 @@ Release schedule When a prerelease of Ansible 8 happens in the same week as an Ansible 7 release, the Ansible 8 prerelease will happen on the day after the Ansible 7 release. When a release of Ansible 8 happens in the same week as an Ansible 9 release, the Ansible 8 release will happen on the day after the Ansible 9 release. + In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. Ansible minor releases diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst index aeb20ef5546..7b421c68a58 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst @@ -44,6 +44,7 @@ Release schedule When a prerelease of Ansible 9 happens in the same week as an Ansible 8 release, the Ansible 9 prerelease will happen on the day after the Ansible 8 release. When a release of Ansible 9 happens in the same week as an Ansible 10 release, the Ansible 9 release will happen on the day after the Ansible 10 release. + In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. Planned major changes From 84852990477704eaf0ed3a5de69361605efa4db0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 30 Jun 2023 07:00:01 +0200 Subject: [PATCH 3/4] Rewrite according to review comments. --- docs/docsite/rst/roadmap/COLLECTIONS_8.rst | 4 ++-- docs/docsite/rst/roadmap/COLLECTIONS_9.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst index 634037f57ce..a96fa51946d 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst @@ -42,9 +42,9 @@ Release schedule .. note:: - When a prerelease of Ansible 8 happens in the same week as an Ansible 7 release, the Ansible 8 prerelease will happen on the day after the Ansible 7 release. - When a release of Ansible 8 happens in the same week as an Ansible 9 release, the Ansible 8 release will happen on the day after the Ansible 9 release. In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. + However, in case two releases are planned for the same day, a release of the latest stable version takes precedence. This means that if a stable Ansible 8 release collides with a pre-release of Ansible 9, the latter will be delayed. + If a Ansible 8 release collides with a stable Ansible 9 release, including 9.0.0, the Ansible 8 release will be delayed. Ansible minor releases diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst index 7b421c68a58..955eaecfc3d 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst @@ -42,9 +42,9 @@ Release schedule .. note:: - When a prerelease of Ansible 9 happens in the same week as an Ansible 8 release, the Ansible 9 prerelease will happen on the day after the Ansible 8 release. - When a release of Ansible 9 happens in the same week as an Ansible 10 release, the Ansible 9 release will happen on the day after the Ansible 10 release. In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. + However, in case two releases are planned for the same day, a release of the latest stable version takes precedence. This means that if a stable Ansible 9 release collides with a pre-release of Ansible 10, the latter will be delayed. + If a Ansible 9 release collides with a stable Ansible 10 release, including 10.0.0, the Ansible 9 release will be delayed. Planned major changes From 2dd18570c2b0427f2bc8532d910f950caa297390 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 30 Jun 2023 23:30:16 +0200 Subject: [PATCH 4/4] Add comma. Co-authored-by: Maxwell G --- docs/docsite/rst/roadmap/COLLECTIONS_8.rst | 2 +- docs/docsite/rst/roadmap/COLLECTIONS_9.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst index a96fa51946d..c86d6fa8b1c 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_8.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_8.rst @@ -42,7 +42,7 @@ Release schedule .. note:: - In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. + In general, it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. However, in case two releases are planned for the same day, a release of the latest stable version takes precedence. This means that if a stable Ansible 8 release collides with a pre-release of Ansible 9, the latter will be delayed. If a Ansible 8 release collides with a stable Ansible 9 release, including 9.0.0, the Ansible 8 release will be delayed. diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst index 955eaecfc3d..ac9cab90836 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_9.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_9.rst @@ -42,7 +42,7 @@ Release schedule .. note:: - In general it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. + In general, it's in the discretion of the release manager to delay a release by 1-2 days for reasons such as personal (schedule) problems, technical problems (CI/infrastructure breakdown), and so on. However, in case two releases are planned for the same day, a release of the latest stable version takes precedence. This means that if a stable Ansible 9 release collides with a pre-release of Ansible 10, the latter will be delayed. If a Ansible 9 release collides with a stable Ansible 10 release, including 10.0.0, the Ansible 9 release will be delayed.