From c9a35eaaa56535c915d31708c59b3e5a90c07b74 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Tue, 25 Feb 2020 18:46:09 -0600
Subject: [PATCH] [sahara] Transition Rocky to EM

This transition the rocky branch to extended maintenance.
Changes for bugfixes and things the team deems important are
still encouraged, but there will no longer be official releases
off of the branch.

Please +1 if the team is ready for us to proceed with this
transition, or -1 if there are any final backports currently in
flight that we should wait for. For the latter case, please
update the patch with the new commit hash after doing a final
release to get those changes out so we know to proceed with the
transition.

Change-Id: Ife50d840ac5fd71443f8b1ba78fdbf5e2dba9ce2
---
 deliverables/rocky/python-saharaclient.yaml   | 4 ++++
 deliverables/rocky/sahara-dashboard.yaml      | 4 ++++
 deliverables/rocky/sahara-extra.yaml          | 4 ++++
 deliverables/rocky/sahara-image-elements.yaml | 4 ++++
 deliverables/rocky/sahara-tests.yaml          | 4 ++++
 deliverables/rocky/sahara.yaml                | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/deliverables/rocky/python-saharaclient.yaml b/deliverables/rocky/python-saharaclient.yaml
index 2c05fba011..2526024a98 100644
--- a/deliverables/rocky/python-saharaclient.yaml
+++ b/deliverables/rocky/python-saharaclient.yaml
@@ -13,6 +13,10 @@ releases:
     projects:
       - repo: openstack/python-saharaclient
         hash: 2a66f9a7150cd92e45f29bb028b60863a27fa443
+  - version: rocky-em
+    projects:
+      - repo: openstack/python-saharaclient
+        hash: 2a66f9a7150cd92e45f29bb028b60863a27fa443
 repository-settings:
   openstack/python-saharaclient: {}
 branches:
diff --git a/deliverables/rocky/sahara-dashboard.yaml b/deliverables/rocky/sahara-dashboard.yaml
index 80f85abe2d..db992bf54f 100644
--- a/deliverables/rocky/sahara-dashboard.yaml
+++ b/deliverables/rocky/sahara-dashboard.yaml
@@ -37,6 +37,10 @@ releases:
       - repo: openstack/sahara-dashboard
         hash: 51a46eab08704053c9feea430831313740c847ae
     version: 9.0.2
+  - version: rocky-em
+    projects:
+      - repo: openstack/sahara-dashboard
+        hash: 51a46eab08704053c9feea430831313740c847ae
 branches:
   - name: stable/rocky
     location: 9.0.0.0rc1
diff --git a/deliverables/rocky/sahara-extra.yaml b/deliverables/rocky/sahara-extra.yaml
index 03f4967cbe..e864adb255 100644
--- a/deliverables/rocky/sahara-extra.yaml
+++ b/deliverables/rocky/sahara-extra.yaml
@@ -16,6 +16,10 @@ releases:
     projects:
       - repo: openstack/sahara-extra
         hash: abacf8f2d43b0b5d2769849d48e78120c58fe163
+  - version: rocky-em
+    projects:
+      - repo: openstack/sahara-extra
+        hash: abacf8f2d43b0b5d2769849d48e78120c58fe163
 repository-settings:
   openstack/sahara-extra: {}
 branches:
diff --git a/deliverables/rocky/sahara-image-elements.yaml b/deliverables/rocky/sahara-image-elements.yaml
index 91af9927f4..b4746d285e 100644
--- a/deliverables/rocky/sahara-image-elements.yaml
+++ b/deliverables/rocky/sahara-image-elements.yaml
@@ -34,6 +34,10 @@ releases:
       - repo: openstack/sahara-image-elements
         hash: 60896d55a4ddf1606e5c36bb85749ae0babc7b8a
     version: 9.0.2
+  - version: rocky-em
+    projects:
+      - repo: openstack/sahara-image-elements
+        hash: 60896d55a4ddf1606e5c36bb85749ae0babc7b8a
 branches:
   - name: stable/rocky
     location: 9.0.0.0rc1
diff --git a/deliverables/rocky/sahara-tests.yaml b/deliverables/rocky/sahara-tests.yaml
index 001b4ff77c..ce4685f707 100644
--- a/deliverables/rocky/sahara-tests.yaml
+++ b/deliverables/rocky/sahara-tests.yaml
@@ -10,5 +10,9 @@ releases:
     projects:
       - repo: openstack/sahara-tests
         hash: bb23a5bd1998d4feefe75e207409e27d0791a5d2
+  - version: rocky-em
+    projects:
+      - repo: openstack/sahara-tests
+        hash: bb23a5bd1998d4feefe75e207409e27d0791a5d2
 repository-settings:
   openstack/sahara-tests: {}
diff --git a/deliverables/rocky/sahara.yaml b/deliverables/rocky/sahara.yaml
index b5b5b769e6..fd59e5876a 100644
--- a/deliverables/rocky/sahara.yaml
+++ b/deliverables/rocky/sahara.yaml
@@ -37,6 +37,10 @@ releases:
       - repo: openstack/sahara
         hash: 8677168b80aeee669d468a09bfb754498f81f5c2
     version: 9.0.2
+  - version: rocky-em
+    projects:
+      - repo: openstack/sahara
+        hash: 8677168b80aeee669d468a09bfb754498f81f5c2
 branches:
   - name: stable/rocky
     location: 9.0.0.0rc1