From d23f551adb7602689511d23bb922b867171af79d Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 8 Oct 2020 15:01:10 +0200
Subject: [PATCH] sahara: tag ocata as EOL

It has been announced on the list, and it follows the path traced
by other projects (including puppet):
http://lists.openstack.org/pipermail/openstack-discuss/2020-October/017709.html

Also, break down the existing setting of the ocata-em branch
for consistency, and clean up a few comments which were only
needed to retrigger some tags.

Change-Id: I1b9bb9436d1dfe21bca7e2730621248400aec246
---
 deliverables/ocata/python-saharaclient.yaml   |  4 ++++
 deliverables/ocata/sahara-dashboard.yaml      |  9 ++++++++-
 deliverables/ocata/sahara-extra.yaml          |  9 ++++++++-
 deliverables/ocata/sahara-image-elements.yaml |  9 ++++++++-
 deliverables/ocata/sahara.yaml                | 10 ++++------
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/deliverables/ocata/python-saharaclient.yaml b/deliverables/ocata/python-saharaclient.yaml
index be998b5555..6b4855a7e3 100644
--- a/deliverables/ocata/python-saharaclient.yaml
+++ b/deliverables/ocata/python-saharaclient.yaml
@@ -21,5 +21,9 @@ releases:
       - hash: 6865768726fafcf519ae5f986557c120d650632b
         repo: openstack/python-saharaclient
     version: ocata-em
+  - projects:
+      - hash: fd724a30205ce3b92a95ac9c0878a06e7d385e3b
+        repo: openstack/python-saharaclient
+    version: ocata-eol
 repository-settings:
   openstack/python-saharaclient: {}
diff --git a/deliverables/ocata/sahara-dashboard.yaml b/deliverables/ocata/sahara-dashboard.yaml
index 838c9ac9fe..4c6fc7d674 100644
--- a/deliverables/ocata/sahara-dashboard.yaml
+++ b/deliverables/ocata/sahara-dashboard.yaml
@@ -20,7 +20,14 @@ releases:
       - repo: openstack/sahara-dashboard
         hash: a93165f6dc3dca1e7e562c6c9bdf53650864a7ab
     version: 6.0.3
+  - version: ocata-em
+    projects:
+      - repo: openstack/sahara-dashboard
+        hash: a93165f6dc3dca1e7e562c6c9bdf53650864a7ab
+  - version: ocata-eol
+    projects:
+      - repo: openstack/sahara-dashboard
+        hash: aeeb0d78b8a961553e4815e9a6171f811252d1db
 repository-settings:
   openstack/sahara-dashboard: {}
 release-notes: https://docs.openstack.org/releasenotes/sahara-dashboard/ocata.html
-# Retriggering ocata-em tagging
diff --git a/deliverables/ocata/sahara-extra.yaml b/deliverables/ocata/sahara-extra.yaml
index b6ec750aa0..87b19ecc6c 100644
--- a/deliverables/ocata/sahara-extra.yaml
+++ b/deliverables/ocata/sahara-extra.yaml
@@ -20,6 +20,13 @@ releases:
     projects:
       - repo: openstack/sahara-extra
         hash: 89b5dbc51d57302027bdaa4e472d0d57e89d5eb4
+  - version: ocata-em
+    projects:
+      - repo: openstack/sahara-extra
+        hash: 89b5dbc51d57302027bdaa4e472d0d57e89d5eb4
+  - version: ocata-eol
+    projects:
+      - repo: openstack/sahara-extra
+        hash: 6895e63e99b3c1276777a2b8237f5be05e74a0f7
 repository-settings:
   openstack/sahara-extra: {}
-# Retriggering ocata-em tagging
diff --git a/deliverables/ocata/sahara-image-elements.yaml b/deliverables/ocata/sahara-image-elements.yaml
index b0f4619f57..3e47ef5418 100644
--- a/deliverables/ocata/sahara-image-elements.yaml
+++ b/deliverables/ocata/sahara-image-elements.yaml
@@ -21,6 +21,13 @@ releases:
     projects:
       - repo: openstack/sahara-image-elements
         hash: 1098b70175baf27ea706a2ca308ba212a1018ad1
+  - version: ocata-em
+    projects:
+      - repo: openstack/sahara-image-elements
+        hash: 1098b70175baf27ea706a2ca308ba212a1018ad1
+  - version: ocata-eol
+    projects:
+      - repo: openstack/sahara-image-elements
+        hash: 085ce7d0e9ff1998637dbd01603e1148ee9565a9
 repository-settings:
   openstack/sahara-image-elements: {}
-# Retriggering ocata-em tagging
diff --git a/deliverables/ocata/sahara.yaml b/deliverables/ocata/sahara.yaml
index 62eb2e6065..6c37efed25 100644
--- a/deliverables/ocata/sahara.yaml
+++ b/deliverables/ocata/sahara.yaml
@@ -87,12 +87,10 @@ releases:
     projects:
       - repo: openstack/sahara
         hash: a2843e8a54465be9c7a5b58e36c854e6b3ad090a
-      - repo: openstack/sahara-image-elements
-        hash: 1098b70175baf27ea706a2ca308ba212a1018ad1
-      - repo: openstack/sahara-dashboard
-        hash: a93165f6dc3dca1e7e562c6c9bdf53650864a7ab
-      - repo: openstack/sahara-extra
-        hash: 89b5dbc51d57302027bdaa4e472d0d57e89d5eb4
+  - version: ocata-eol
+    projects:
+      - repo: openstack/sahara
+        hash: 4459e12258d990a3a67f96012d9fe5b1b8ea7bb7
 repository-settings:
   openstack/sahara: {}
   openstack/sahara-dashboard: {}