From ae0dd8253f1c405d9abe3a6d250ee9b7fa9b126b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 28 Feb 2024 13:29:50 +0900
Subject: [PATCH] Retire puppet-sahara: Mark the deliverables as retired

Sahara was marked inactive during this cycle and has been excluded from
2024.1 release. Because Puppet OpenStack modules are tightly coupled
with OpenStack's release cycle, we agreed to retire this module and
not to create a 2024.1 release.

[1] https://lists.openstack.org/archives/list/openstack-discuss@lists.openstack.org/message/BYGTRBDBLZ5XFYQDWOJHDZ3FVYDPQ3LW/

Depends-on: https://review.opendev.org/c/openstack/governance/+/910454
Change-Id: Ie84f1ea3a099d20643f2c3544fcfce54c70bd21b
---
 deliverables/antelope/puppet-sahara.yaml | 4 +++-
 deliverables/bobcat/puppet-sahara.yaml   | 4 +++-
 deliverables/caracal/puppet-sahara.yaml  | 7 -------
 deliverables/wallaby/puppet-sahara.yaml  | 4 +++-
 deliverables/xena/puppet-sahara.yaml     | 4 +++-
 deliverables/yoga/puppet-sahara.yaml     | 4 +++-
 deliverables/zed/puppet-sahara.yaml      | 4 +++-
 7 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 deliverables/caracal/puppet-sahara.yaml

diff --git a/deliverables/antelope/puppet-sahara.yaml b/deliverables/antelope/puppet-sahara.yaml
index 79378728ef..7adf0ed3d1 100644
--- a/deliverables/antelope/puppet-sahara.yaml
+++ b/deliverables/antelope/puppet-sahara.yaml
@@ -9,7 +9,9 @@ releases:
         repo: openstack/puppet-sahara
     version: 22.0.0
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 branches:
   - name: stable/2023.1
     location: 22.0.0
diff --git a/deliverables/bobcat/puppet-sahara.yaml b/deliverables/bobcat/puppet-sahara.yaml
index 54d64cc5df..846ad6bf09 100644
--- a/deliverables/bobcat/puppet-sahara.yaml
+++ b/deliverables/bobcat/puppet-sahara.yaml
@@ -9,7 +9,9 @@ releases:
         repo: openstack/puppet-sahara
     version: 23.0.0
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 branches:
   - name: stable/2023.2
     location: 23.0.0
diff --git a/deliverables/caracal/puppet-sahara.yaml b/deliverables/caracal/puppet-sahara.yaml
deleted file mode 100644
index c151a67ac7..0000000000
--- a/deliverables/caracal/puppet-sahara.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-launchpad: puppet-sahara
-release-model: cycle-with-intermediary
-team: Puppet OpenStack
-type: trailing
-repository-settings:
-  openstack/puppet-sahara: {}
diff --git a/deliverables/wallaby/puppet-sahara.yaml b/deliverables/wallaby/puppet-sahara.yaml
index 36316b5be4..31133c4ce5 100644
--- a/deliverables/wallaby/puppet-sahara.yaml
+++ b/deliverables/wallaby/puppet-sahara.yaml
@@ -4,7 +4,9 @@ release-model: cycle-with-intermediary
 team: Puppet OpenStack
 type: trailing
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 releases:
   - projects:
       - hash: d9812ec5be4fd6edbdfaa0d76f8eab7d3dd5edda
diff --git a/deliverables/xena/puppet-sahara.yaml b/deliverables/xena/puppet-sahara.yaml
index cd3c886c63..4905cddce3 100644
--- a/deliverables/xena/puppet-sahara.yaml
+++ b/deliverables/xena/puppet-sahara.yaml
@@ -4,7 +4,9 @@ release-model: cycle-with-intermediary
 team: Puppet OpenStack
 type: trailing
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 releases:
   - projects:
       - hash: 550934cd6147dc5111817260e7fcd4fe6cacbb9c
diff --git a/deliverables/yoga/puppet-sahara.yaml b/deliverables/yoga/puppet-sahara.yaml
index dc733f0ade..767e17cc14 100644
--- a/deliverables/yoga/puppet-sahara.yaml
+++ b/deliverables/yoga/puppet-sahara.yaml
@@ -29,7 +29,9 @@ releases:
       - repo: openstack/puppet-sahara
         hash: 8b82f3c4a09174352c21356e34a860fcbf04055f
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 branches:
   - name: stable/yoga
     location: 20.3.0
diff --git a/deliverables/zed/puppet-sahara.yaml b/deliverables/zed/puppet-sahara.yaml
index b0c21b562c..94e8be0f7d 100644
--- a/deliverables/zed/puppet-sahara.yaml
+++ b/deliverables/zed/puppet-sahara.yaml
@@ -9,7 +9,9 @@ releases:
         repo: openstack/puppet-sahara
     version: 21.0.0
 repository-settings:
-  openstack/puppet-sahara: {}
+  openstack/puppet-sahara:
+    flags:
+      - retired
 branches:
   - name: stable/zed
     location: 21.0.0