From c935b243bcf2f6282c3be642f3233f51341ba936 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Tue, 25 Feb 2020 18:46:11 -0600
Subject: [PATCH] [octavia] 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: Ia2af5977a8a8ab4dc5149683d02b848702a26845
---
 deliverables/rocky/neutron-lbaas-dashboard.yaml | 4 ++++
 deliverables/rocky/neutron-lbaas.yaml           | 4 ++++
 deliverables/rocky/octavia-dashboard.yaml       | 4 ++++
 deliverables/rocky/octavia-tempest-plugin.yaml  | 4 ++++
 deliverables/rocky/octavia.yaml                 | 4 ++++
 deliverables/rocky/python-octaviaclient.yaml    | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/deliverables/rocky/neutron-lbaas-dashboard.yaml b/deliverables/rocky/neutron-lbaas-dashboard.yaml
index 8f06f33c63..bf460730cb 100644
--- a/deliverables/rocky/neutron-lbaas-dashboard.yaml
+++ b/deliverables/rocky/neutron-lbaas-dashboard.yaml
@@ -37,6 +37,10 @@ releases:
     projects:
       - repo: openstack/neutron-lbaas-dashboard
         hash: 32c9501d6b960c56237be889ddf611ff0f4d9bf5
+  - version: rocky-em
+    projects:
+      - repo: openstack/neutron-lbaas-dashboard
+        hash: 32c9501d6b960c56237be889ddf611ff0f4d9bf5
 branches:
   - location: 5.0.0.0rc1
     name: stable/rocky
diff --git a/deliverables/rocky/neutron-lbaas.yaml b/deliverables/rocky/neutron-lbaas.yaml
index 4a68cbd636..8a7d98049b 100644
--- a/deliverables/rocky/neutron-lbaas.yaml
+++ b/deliverables/rocky/neutron-lbaas.yaml
@@ -32,6 +32,10 @@ releases:
       - hash: e22276df0560f38d6527a56808764924d66b3f5d
         repo: openstack/neutron-lbaas
     version: 13.0.1
+  - version: rocky-em
+    projects:
+      - repo: openstack/neutron-lbaas
+        hash: e22276df0560f38d6527a56808764924d66b3f5d
 branches:
   - location: 13.0.0.0rc1
     name: stable/rocky
diff --git a/deliverables/rocky/octavia-dashboard.yaml b/deliverables/rocky/octavia-dashboard.yaml
index a699d3caee..f07121829c 100644
--- a/deliverables/rocky/octavia-dashboard.yaml
+++ b/deliverables/rocky/octavia-dashboard.yaml
@@ -46,6 +46,10 @@ releases:
     projects:
       - repo: openstack/octavia-dashboard
         hash: 0e14846f712fedfdc8b56686bde2114d26b241fe
+  - version: rocky-em
+    projects:
+      - repo: openstack/octavia-dashboard
+        hash: 0e14846f712fedfdc8b56686bde2114d26b241fe
 branches:
   - location: 2.0.0.0rc1
     name: stable/rocky
diff --git a/deliverables/rocky/octavia-tempest-plugin.yaml b/deliverables/rocky/octavia-tempest-plugin.yaml
index fcabab50ff..628cd9dcf8 100644
--- a/deliverables/rocky/octavia-tempest-plugin.yaml
+++ b/deliverables/rocky/octavia-tempest-plugin.yaml
@@ -16,3 +16,7 @@ releases:
       - hash: 70c06d8b646ac987736a6e8e281998af2548ae81
         repo: openstack/octavia-tempest-plugin
     version: 0.2.0
+  - version: rocky-em
+    projects:
+      - repo: openstack/octavia-tempest-plugin
+        hash: 70c06d8b646ac987736a6e8e281998af2548ae81
diff --git a/deliverables/rocky/octavia.yaml b/deliverables/rocky/octavia.yaml
index ea2e6d3271..3b9d4d9ae2 100644
--- a/deliverables/rocky/octavia.yaml
+++ b/deliverables/rocky/octavia.yaml
@@ -66,6 +66,10 @@ releases:
     projects:
       - repo: openstack/octavia
         hash: e7376be7afec98192da969dc9382ad860b1cbe01
+  - version: rocky-em
+    projects:
+      - repo: openstack/octavia
+        hash: e7376be7afec98192da969dc9382ad860b1cbe01
 branches:
   - location: 3.0.0.0rc1
     name: stable/rocky
diff --git a/deliverables/rocky/python-octaviaclient.yaml b/deliverables/rocky/python-octaviaclient.yaml
index a10c2dc69b..43371f7c78 100644
--- a/deliverables/rocky/python-octaviaclient.yaml
+++ b/deliverables/rocky/python-octaviaclient.yaml
@@ -22,6 +22,10 @@ releases:
     projects:
       - repo: openstack/python-octaviaclient
         hash: 1c9fd5ba80dd2128a69f9cd24d10da4fa7b9312f
+  - version: rocky-em
+    projects:
+      - repo: openstack/python-octaviaclient
+        hash: 1c9fd5ba80dd2128a69f9cd24d10da4fa7b9312f
 repository-settings:
   openstack/python-octaviaclient: {}
 branches: