From 92581c2859856869ef20d27c5873a33c58a5328b Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Tue, 19 Oct 2021 20:16:44 +0200
Subject: [PATCH] Update release schedule for Sulfur, P SR1 & Si SR3

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I06c2166dbe2f7e90f3dd202db6a0b833a119ef6a
(cherry picked from commit 843d91aacd0abe4b9ee3655a72bbae0de0c93f30)
---
 docs/release-process/release-schedule.rst | 52 +++++++++++++++--------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/docs/release-process/release-schedule.rst b/docs/release-process/release-schedule.rst
index 13b11bd5c..5e2a4cf71 100644
--- a/docs/release-process/release-schedule.rst
+++ b/docs/release-process/release-schedule.rst
@@ -12,33 +12,37 @@ Self-managed projects that wants to integrate the distribution have one week
 to release once managed projects are ready.
 
 .. list-table::
-   :widths: 20 20 20 20 20 40
+   :widths: 20 20 20 20 20 20 40
    :header-rows: 1
    :stub-columns: 1
 
    * - **Event**
+     - **Sulfur Dates**
+     - **Phosphorus Dates**
      - **Silicon Dates**
-     - **Aluminium Dates**
      - **Relative Dates**
      - **Start-Relative Dates**
      - **Description**
 
    * - Release Start
+     - 2021-09-23
+     - 2021-03-17
      - 2020-09-17
-     - 2020-03-16
      - Start Date
      - Start Date +0
      - Declare Intention: Submit **Project_Plan** Jira item in TSC project.
    * - Initial Checkpoint
+     - 2021-10-07
+     - 2021-03-31
      - 2020-10-01
-     - 2020-03-30
      - Start Date +2 weeks
      - Start Date +2 weeks
      - Initial Checkpoint. All Managed Projects must have completed
        **Project_Plan** Jira items in TSC project.
    * - Release Integrated Deadline
+     - 2021-10-21
+     - 2021-04-15
      - 2020-10-15
-     - 2020-04-13
      - Initial Checkpoint + 2 weeks
      - Start Date +4 weeks
      - Deadline for Release Integrated Projects (currently, ODLPARENT,
@@ -46,81 +50,93 @@ to release once managed projects are ready.
        version deliverables for downstream Snapshot Integrated Projects to
        consume.
    * - Version Bump
+     - 2021-10-22
+     - 2021-04-16
      - 2020-10-16
-     - 2020-04-14
      - Release Integrated Deadline + 1 day
      - Start Date +4 weeks 1 day
      - Prepare version bump patches and merge them in (RelEng team). Spend the
        next 2 weeks to get green build for all MSI Projects and a healthy
        distribution.
    * - Version Bump Checkpoint
+     - 2021-11-04
+     - 2021-04-29
      - 2020-10-29
-     - 2020-04-27
      - Release Integrated Deadline + 2 weeks
      - Start Date +6 weeks
      - Check status of MSI Projects to see if we have green builds and a
        healthy distribution. Revert the MRI deliverables if deemed necessary.
    * - CSIT Checkpoint
+     - 2021-11-18
+     - 2021-05-13
      - 2020-11-12
-     - 2020-05-11
      - Version Bump Checkpoint + 2 weeks
      - Start Date +8 weeks
      - All Managed Release CSIT should be in good shape - get all MSI Projects'
        CSIT results as they were before the version bump. This is the final
        opportunity to revert the MRI deliverables if deemed necessary.
    * - Middle Checkpoint
+     - 2022-01-13
+     - 2021-07-08
      - 2021-01-07
-     - 2020-07-06
      - CSIT Checkpoint + 8 weeks (sometimes +2 weeks to avoid December holidays)
      - Start Date +16 weeks (sometimes +2 weeks to avoid December holidays)
      - Checkpoint for status of Managed Projects - especially Snapshot
        Integrated Projects.
    * - Code Freeze
+     - 2022-02-10
+     - 2021-08-05
      - 2021-02-22
-     - 2020-08-03
      - Middle Checkpoint + 4 weeks
      - Start Date +20 weeks
      - Code freeze for all Managed Projects - cut and lock release branch. Only
        allow blocker bug fixes in release branch.
    * - Final Checkpoint
+     - 2022-02-24
+     - 2021-08-19
      - 2021-03-08
-     - 2020-08-17
      - Code Freeze + 2 weeks
      - Start Date +22 weeks
      - Final Checkpoint for all Managed Projects.
    * - Formal Release
+     - 2022-03-17
+     - 2021-09-16
      - 2021-03-17
-     - 2020-09-17
      - 6 months after Start Date
      - Start Date +6 months
      - Formal Release for Managed Projects. Self-managed projects usually are released a week later.
    * - Service Release 1
+     - 2022-04-28
+     - 2021-11-22
      - 2021-06-03
-     - 2020-10-29
      - 1.5 month after Formal Release
      - Start Date +7.5 months
      - Service Release 1 (SR1)
    * - Service Release 2
+     - 2022-07-28
+     - 2022-01-27
      - 2021-07-28
-     - N/A
      - 3 months after SR1
      - Start Date +10.5 months
      - Service Release 2 (SR2)
    * - Service Release 3
-     - 2021-10-28
-     - 2021-03-19
+     - 2022-10-28
+     - 2022-05-12
+     - 2021-11-04
      - 4 months after SR2
      - Start Date +14 months
      - Service Release 3 (SR3)
    * - Service Release 4
      - N/A
-     - 2021-06-02
+     - N/A
+     - N/A
      - Not Applicable
      - Not Applicable
      - Service Release 4 (SR4) - Final Service Release
    * - Release End of Life
+     - 2023-03-16
+     - 2022-09-15
      - 2022-03-17
-     - 2021-09-13
      - 4 months after SR3
      - Start Date +18 months
      - End of Life - coincides with the Formal Release of the current release+2
-- 
2.36.6