From 54ffa7eb48e2a6d88b71be0bc46ea81b8573514c Mon Sep 17 00:00:00 2001
From: Kendall Nelson <kennelson11@gmail.com>
Date: Mon, 26 Mar 2018 11:42:07 -0700
Subject: [PATCH] Add Rocky TC Election Dates

This patch adds the dates to the Rocky release
calendar that were decided upon here [1].

[1]https://review.openstack.org/#/c/551404/

Story: 2001611
Task: 12049

Change-Id: Iaafe2e4e52b83c5f01a87a60cbcde0fc1c138875
---
 doc/source/rocky/schedule.rst  | 32 ++++++++++++++++++++++++++++++--
 doc/source/rocky/schedule.yaml |  6 ++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/doc/source/rocky/schedule.rst b/doc/source/rocky/schedule.rst
index fad9172342..14d3df571a 100644
--- a/doc/source/rocky/schedule.rst
+++ b/doc/source/rocky/schedule.rst
@@ -210,12 +210,40 @@ Rocky cycle-trailing release deadline
 The release deadline for projects using the release:cycle-trailing model that
 follow the main release cycle is set to November 28, 2018.
 
+.. _r-tc-email-deadline:
+
+TC Election Email Deadline
+--------------------------
+Contributors that will be in the electorate for the upcoming election
+should confirm their gerrit email addresses by this date (April 18th, 2018 at
+00:00 UTC). Electorate rolls are generated after this date and ballots will
+be sent to the listed gerrit email address.
+
+.. _r-tc-nominations:
+
+TC Election Nomination Begins
+-----------------------------
+Technical committee candidates interested in serving for the next calendar year
+should announce their candidacies and platforms during this week.
+
+.. _r-tc-campaigning:
+
+TC Election Campaigning Begins
+------------------------------
+The electorate has time to ask candidates questions about their platforms
+and debate topics before polling begins.
+
+.. _r-tc-polling:
+
+TC Election Polling Begins
+--------------------------
+Election polling week for open seats on the TC.
 
 Project-specific events
 =======================
 
-Elections
----------
+PTL Elections
+-------------
 
 Keystone
 --------
diff --git a/doc/source/rocky/schedule.yaml b/doc/source/rocky/schedule.yaml
index 6d4325743b..ea8254f489 100644
--- a/doc/source/rocky/schedule.yaml
+++ b/doc/source/rocky/schedule.yaml
@@ -24,17 +24,23 @@ cycle:
   - end: '2018-04-13'
     name: R-20
     start: '2018-04-09'
+    x-project:
+      - r-tc-nominations
   - end: '2018-04-20'
     name: 'R-19'
     start: '2018-04-16'
     x-project:
       - r-1
+      - r-tc-email-deadline
+      - r-tc-campaigning
     project-specific:
       - r-manila-spec-freeze
       - r-keystone-spec-proposal-freeze
   - end: '2018-04-27'
     name: R-18
     start: '2018-04-23'
+    x-project:
+      - r-tc-polling
   - end: '2018-05-04'
     name: R-17
     start: '2018-04-30'