From 9f652aee73a2061b06a66933bcb4d02b94d81980 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Mon, 19 Apr 2021 15:53:01 -0400
Subject: [PATCH] Add Cinder-specific dates for Xena schedule

Change-Id: I1b6c282a1e17795627e6bfd66e40ee7ec7e1ad32
---
 doc/source/xena/schedule.rst  | 70 +++++++++++++++++++++++++++++++++++
 doc/source/xena/schedule.yaml |  9 +++++
 2 files changed, 79 insertions(+)

diff --git a/doc/source/xena/schedule.rst b/doc/source/xena/schedule.rst
index 94afe444d9..740f02f971 100644
--- a/doc/source/xena/schedule.rst
+++ b/doc/source/xena/schedule.rst
@@ -225,6 +225,76 @@ For examples of previous release highlights:
 Project-specific events
 =======================
 
+Cinder
+------
+
+.. _x-cinder-spec-freeze:
+
+Cinder Spec Freeze
+^^^^^^^^^^^^^^^^^^
+
+All Cinder Specs for features to be implemented in Xena must be approved by
+Friday 25 June 2021 (23:59 UTC).
+
+.. _x-cinder-driver-deadline:
+
+Cinder New Driver Merge Deadline
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The deadline for merging a new backend driver to Cinder for the Xena
+release is Thursday 15 July 2021 (20:00 UTC).  New drivers must be (a) code
+complete including unit tests, (b) merged into the code repository, and (c)
+must have a 3rd Party CI running reliably.  (The idea is that new drivers will
+be included in a release at the second milestone and thus be easily available
+for downstream testing, documentation feedback, etc.)
+
+.. _x-cinder-target-driver-deadline:
+
+Cinder New Target Driver Merge Deadline
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The deadline for merging a new target driver to Cinder for the Xena release
+is Thursday 15 July 2021 (20:00 UTC).  New target drivers must be (a) code
+complete including unit tests, (b) merged into the code repository, and (c)
+must have a 3rd Party CI running reliably.  (The idea is that new drivers will
+be included in a release at the second milestone and thus be easily available
+for downstream testing, documentation feedback, etc.)
+
+.. _x-cinder-feature-checkpoint:
+
+Cinder New Feature Status Checkpoint
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If your new Cinder feature requires client support, keep in mind that the final
+release for client libraries is in four weeks.  Thus your Cinder feature
+should be substantially complete with unit tests by this time so that any
+client changes can be reviewed, tested, and merged before 2 September 2021.
+
+.. _x-cinder-driver-features-declaration:
+
+Cinder Driver Features Declaration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+New features added to Cinder drivers must be merged at the time of the
+OpenStack-wide Feature Freeze, which is coming up in three weeks.  Before
+the Cinder meeting this week, you should post a blueprint in Launchpad listing
+the Gerrit reviews of features you'd like to land in Xena.  (You can look
+among the Victoria and Wallaby blueprints for examples; contact the PTL if you
+have any questions.)  This will help the team prioritize reviews and give you
+candid early feedback on whether the features look ready.
+
+.. _x-cinder-ci-checkpoint:
+
+Cinder 3rd Party CI Compliance Checkpoint
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is a reminder that in order for a Cinder driver to be considered
+'supported' in the Xena release, its third party CI must be running
+properly when the Cinder team does a final compliance check around the
+time of the third milestone.  See the `Driver Compliance
+<https://docs.openstack.org/cinder/latest/drivers-all-about.html#driver-compliance>`_
+section of the Cinder Documentation for details.
+
 Manila
 ------
 
diff --git a/doc/source/xena/schedule.yaml b/doc/source/xena/schedule.yaml
index 938d75b0f9..e76224d1b3 100644
--- a/doc/source/xena/schedule.yaml
+++ b/doc/source/xena/schedule.yaml
@@ -41,6 +41,7 @@ cycle:
   name: R-15
   start: '2021-06-21'
   project-specific:
+    - x-cinder-spec-freeze
     - x-manila-spec-freeze
 - end: '2021-07-02'
   name: R-14
@@ -56,6 +57,9 @@ cycle:
   x-project:
     - x-2
     - x-mf
+  project-specific:
+    - x-cinder-driver-deadline
+    - x-cinder-target-driver-deadline
 - end: '2021-07-23'
   name: R-11
   start: '2021-07-19'
@@ -68,12 +72,15 @@ cycle:
   name: R-9
   start: '2021-08-02'
   project-specific:
+    - x-cinder-feature-checkpoint
     - x-manila-fpfreeze
 - end: '2021-08-13'
   name: R-8
   start: '2021-08-09'
   x-project:
     - x-extra-atc-freeze
+  project-specific:
+    - x-cinder-driver-features-declaration
 - end: '2021-08-20'
   name: R-7
   start: '2021-08-16'
@@ -95,6 +102,8 @@ cycle:
     - x-rf
     - x-goals-complete
     - x-cycle-highlights
+  project-specific:
+    - x-cinder-ci-checkpoint
 - end: '2021-09-10'
   name: R-4
   start: '2021-09-06'