From a7b530ce7afc8715601d102d27726283a791007f Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 7 Feb 2024 12:34:55 -0800
Subject: [PATCH] End support for stable/yoga

This marks the end of support for stable/yoga
which is moving to 'unmaintained' stage[1].
This remove the stable/yoga jobs and also adds
relesenote to mark the end of support of Yoga.

[1] https://review.opendev.org/q/topic:%22yoga-unmaintained%22

Change-Id: I364bcd69f55753e4c99f66240f743e3bc7205832
---
 doc/source/supported_version.rst               |  1 -
 ...nd-of-support-of-yoga-4ad45e91fe893024.yaml | 12 ++++++++++++
 zuul.d/project.yaml                            |  6 +-----
 zuul.d/stable-jobs.yaml                        | 18 ------------------
 4 files changed, 13 insertions(+), 24 deletions(-)
 create mode 100644 releasenotes/notes/end-of-support-of-yoga-4ad45e91fe893024.yaml

diff --git a/doc/source/supported_version.rst b/doc/source/supported_version.rst
index 89f0f904ca..e97b6f452e 100644
--- a/doc/source/supported_version.rst
+++ b/doc/source/supported_version.rst
@@ -12,7 +12,6 @@ Tempest master supports the below OpenStack Releases:
 * 2023.2
 * 2023.1
 * Zed
-* Yoga
 
 For older OpenStack Release:
 
diff --git a/releasenotes/notes/end-of-support-of-yoga-4ad45e91fe893024.yaml b/releasenotes/notes/end-of-support-of-yoga-4ad45e91fe893024.yaml
new file mode 100644
index 0000000000..ceeb2b24c3
--- /dev/null
+++ b/releasenotes/notes/end-of-support-of-yoga-4ad45e91fe893024.yaml
@@ -0,0 +1,12 @@
+---
+prelude: >
+    This is an intermediate release during the 2024.1 development cycle to
+    mark the end of support for Yoga release in Tempest.
+    After this release, Tempest will support below OpenStack Releases:
+
+    * 2023.2
+    * 2023.1
+    * Zed
+
+    Current development of Tempest is for OpenStack 2024.1 development
+    cycle.
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3f32f9f64d..d0f3c3c988 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -39,7 +39,7 @@
         # those in respective stable branch gate.
         - tempest-full-2023-2:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-full-yoga:
+        - tempest-full-zed:
             irrelevant-files: *tempest-irrelevant-files
         - tempest-multinode-full-py3:
             irrelevant-files: *tempest-irrelevant-files
@@ -170,7 +170,6 @@
         - tempest-all-rbac-old-defaults
         - tempest-full-parallel
         - tempest-full-zed-extra-tests
-        - tempest-full-yoga-extra-tests
         - tempest-full-enforce-scope-new-defaults-zed
         - neutron-ovs-tempest-dvr-ha-multinode-full:
             irrelevant-files: *tempest-irrelevant-files
@@ -193,15 +192,12 @@
         - tempest-full-2023-2
         - tempest-full-2023-1
         - tempest-full-zed
-        - tempest-full-yoga
         - tempest-slow-2023-2
         - tempest-slow-2023-1
         - tempest-slow-zed
-        - tempest-slow-yoga
         - tempest-full-2023-2-extra-tests
         - tempest-full-2023-1-extra-tests
         - tempest-full-zed-extra-tests
-        - tempest-full-yoga-extra-tests
     periodic:
       jobs:
         - tempest-all
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 2fdc2afe34..c62209aa52 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -17,12 +17,6 @@
     nodeset: openstack-single-node-focal
     override-checkout: stable/zed
 
-- job:
-    name: tempest-full-yoga
-    parent: tempest-full-py3
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/yoga
-
 - job:
     name: tempest-full-2023-2-extra-tests
     parent: tempest-extra-tests
@@ -41,12 +35,6 @@
     nodeset: openstack-single-node-focal
     override-checkout: stable/zed
 
-- job:
-    name: tempest-full-yoga-extra-tests
-    parent: tempest-extra-tests
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/yoga
-
 - job:
     name: tempest-slow-2023-2
     parent: tempest-slow-py3
@@ -71,12 +59,6 @@
     nodeset: openstack-two-node-focal
     override-checkout: stable/zed
 
-- job:
-    name: tempest-slow-yoga
-    parent: tempest-slow-py3
-    nodeset: openstack-two-node-focal
-    override-checkout: stable/yoga
-
 - job:
     name: tempest-full-py3
     parent: devstack-tempest