From 78636204280846d396231878c42229ef3055bbce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= <elod.illes@est.tech>
Date: Thu, 11 Nov 2021 18:20:54 +0100
Subject: [PATCH] [octavia] Transition Ussuri to EM

This transition the ussuri 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: I92b8087c297640f1076f6379c456933eabf3a6d6
---
 deliverables/ussuri/octavia-dashboard.yaml    | 4 ++++
 deliverables/ussuri/octavia-lib.yaml          | 4 ++++
 deliverables/ussuri/octavia.yaml              | 4 ++++
 deliverables/ussuri/python-octaviaclient.yaml | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/deliverables/ussuri/octavia-dashboard.yaml b/deliverables/ussuri/octavia-dashboard.yaml
index d59f8150be..ebe9d2423c 100644
--- a/deliverables/ussuri/octavia-dashboard.yaml
+++ b/deliverables/ussuri/octavia-dashboard.yaml
@@ -29,6 +29,10 @@ releases:
     projects:
       - repo: openstack/octavia-dashboard
         hash: fd73b213026617a2949cebcc834b84246dd540a3
+  - version: ussuri-em
+    projects:
+      - repo: openstack/octavia-dashboard
+        hash: fd73b213026617a2949cebcc834b84246dd540a3
 branches:
   - name: stable/ussuri
     location: 5.0.0.0rc1
diff --git a/deliverables/ussuri/octavia-lib.yaml b/deliverables/ussuri/octavia-lib.yaml
index e7437fc47c..489ba97759 100644
--- a/deliverables/ussuri/octavia-lib.yaml
+++ b/deliverables/ussuri/octavia-lib.yaml
@@ -19,4 +19,8 @@ releases:
     projects:
       - repo: openstack/octavia-lib
         hash: 99118d2e47f24fc9aeccb8da530cd8133e530cc9
+  - version: ussuri-em
+    projects:
+      - repo: openstack/octavia-lib
+        hash: 99118d2e47f24fc9aeccb8da530cd8133e530cc9
 release-notes: https://docs.openstack.org/releasenotes/octavia-lib/ussuri.html
diff --git a/deliverables/ussuri/octavia.yaml b/deliverables/ussuri/octavia.yaml
index cb4362417f..473d629877 100644
--- a/deliverables/ussuri/octavia.yaml
+++ b/deliverables/ussuri/octavia.yaml
@@ -49,6 +49,10 @@ releases:
     projects:
       - repo: openstack/octavia
         hash: 0b4e05aeb6525a7f42c5f4d1193def75d9551529
+  - version: ussuri-em
+    projects:
+      - repo: openstack/octavia
+        hash: 0b4e05aeb6525a7f42c5f4d1193def75d9551529
 branches:
   - name: stable/ussuri
     location: 6.0.0.0rc1
diff --git a/deliverables/ussuri/python-octaviaclient.yaml b/deliverables/ussuri/python-octaviaclient.yaml
index 1f3ca39569..9cdc21af35 100644
--- a/deliverables/ussuri/python-octaviaclient.yaml
+++ b/deliverables/ussuri/python-octaviaclient.yaml
@@ -26,4 +26,8 @@ releases:
     projects:
       - repo: openstack/python-octaviaclient
         hash: 6d843fb6f1c3ed6aa7bd8c9acf6afea15fc783a3
+  - version: ussuri-em
+    projects:
+      - repo: openstack/python-octaviaclient
+        hash: 6d843fb6f1c3ed6aa7bd8c9acf6afea15fc783a3
 release-notes: https://docs.openstack.org/releasenotes/python-octaviaclient/ussuri.html