From af55f291f9ae64bfad896147368c976ffb58ff7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= <elod.illes@est.tech>
Date: Wed, 9 Jun 2021 21:23:24 +0200
Subject: [PATCH] [solum] Transition Ocata to End of Life

This transition the Ocata branch to End of Life. The last patch of the
branch will be tagged with ocata-eol tag. The ocata branch cannot be
used anymore and will be deleted if this patch merges.

This is needed as stable/ocata is not actively maintained in the recent
period and thus gate is broken due to job failures. By removing these
branches, infra resources will be freed up, too.

Please try to identify any zuul job, that is defined outside of the
repositories in this patch (for example in openstack-zuul-jobs, etc.)
and won't be used anymore if stable/ocata is deleted, and propose a job
removal patch for them.

Please +1 if the team is ready for us to proceed with this transition,
or -1 if there are still some activity on the branch and the team wants
to continue to maintain it.

Change-Id: I9feee9886ffade1d501ccadc40c41423b0d36d5c
---
 deliverables/ocata/python-solumclient.yaml | 4 ++++
 deliverables/ocata/solum-dashboard.yaml    | 4 ++++
 deliverables/ocata/solum.yaml              | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/deliverables/ocata/python-solumclient.yaml b/deliverables/ocata/python-solumclient.yaml
index 0e81f74062..743a3c7caa 100644
--- a/deliverables/ocata/python-solumclient.yaml
+++ b/deliverables/ocata/python-solumclient.yaml
@@ -15,5 +15,9 @@ releases:
       - hash: a8fc1bc6fe6a33e8ab452d17418d901c08c9a3d9
         repo: openstack/python-solumclient
     version: ocata-em
+  - version: ocata-eol
+    projects:
+      - repo: openstack/python-solumclient
+        hash: a037a49301b55155a3377e99b324f677e94a860b
 repository-settings:
   openstack/python-solumclient: {}
diff --git a/deliverables/ocata/solum-dashboard.yaml b/deliverables/ocata/solum-dashboard.yaml
index 97e9e0b3a3..3112f6000c 100644
--- a/deliverables/ocata/solum-dashboard.yaml
+++ b/deliverables/ocata/solum-dashboard.yaml
@@ -15,6 +15,10 @@ releases:
       - hash: 7d0dfc16af23883147ca9381268a07e1ab36d443
         repo: openstack/solum-dashboard
     version: ocata-em
+  - version: ocata-eol
+    projects:
+      - repo: openstack/solum-dashboard
+        hash: 54955181278611a171ad39cbcfc56c278441fe57
 repository-settings:
   openstack/solum-dashboard: {}
 # Retriggering ocata-em tagging
diff --git a/deliverables/ocata/solum.yaml b/deliverables/ocata/solum.yaml
index 97c87c77ac..d0a9be9c48 100644
--- a/deliverables/ocata/solum.yaml
+++ b/deliverables/ocata/solum.yaml
@@ -20,6 +20,10 @@ releases:
       - hash: 6e88f9b39ce3088446c8b1f07cf0afe7997e5286
         repo: openstack/solum
     version: ocata-em
+  - version: ocata-eol
+    projects:
+      - repo: openstack/solum
+        hash: c7c573629d0db91e42ea9d96d2a1c50f368024d6
 repository-settings:
   openstack/solum: {}
 # Retriggering ocata-em tagging