From c550f779769380ee3da4039ded320024b0080615 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 1 Jun 2023 13:27:12 -0500
Subject: [PATCH] End support for stable/xena

This marks the end of support for stable/xena
which is EM now [1]. This remove the stable/xena
jobs and also adds relesenote to mark the end of
support of Xena.

[1] https://review.opendev.org/c/openstack/releases/+/881254
    https://releases.openstack.org/

Change-Id: I1027823aa378e9c669dca5a1bc49a9ada604a3d7
---
 ...nd-of-support-of-xena-2e747cff7f8bc48a.yaml | 12 ++++++++++++
 zuul.d/project.yaml                            |  6 +-----
 zuul.d/stable-jobs.yaml                        | 18 ------------------
 3 files changed, 13 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/end-of-support-of-xena-2e747cff7f8bc48a.yaml

diff --git a/releasenotes/notes/end-of-support-of-xena-2e747cff7f8bc48a.yaml b/releasenotes/notes/end-of-support-of-xena-2e747cff7f8bc48a.yaml
new file mode 100644
index 0000000000..39f686605b
--- /dev/null
+++ b/releasenotes/notes/end-of-support-of-xena-2e747cff7f8bc48a.yaml
@@ -0,0 +1,12 @@
+---
+prelude: >
+    This is an intermediate release during the 2023.2 development cycle to
+    mark the end of support for EM Xena release in Tempest.
+    After this release, Tempest will support below OpenStack Releases:
+
+    * 2023.1
+    * Zed
+    * Yoga
+
+    Current development of Tempest is for OpenStack 2023.2 development
+    cycle.
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index be8442a3b5..125f66251c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -40,7 +40,7 @@
         # those in respective stable branch gate.
         - tempest-full-2023-1:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-full-xena:
+        - tempest-full-yoga:
             irrelevant-files: *tempest-irrelevant-files
         - tempest-multinode-full-py3:
             irrelevant-files: *tempest-irrelevant-files
@@ -165,7 +165,6 @@
         - tempest-full-parallel
         - tempest-full-zed-extra-tests
         - tempest-full-yoga-extra-tests
-        - tempest-full-xena-extra-tests
         - tempest-full-enforce-scope-new-defaults-zed
         - neutron-ovs-tempest-dvr-ha-multinode-full:
             irrelevant-files: *tempest-irrelevant-files
@@ -188,15 +187,12 @@
         - tempest-full-2023-1
         - tempest-full-zed
         - tempest-full-yoga
-        - tempest-full-xena
         - tempest-slow-2023-1
         - tempest-slow-zed
         - tempest-slow-yoga
-        - tempest-slow-xena
         - tempest-full-2023-1-extra-tests
         - tempest-full-zed-extra-tests
         - tempest-full-yoga-extra-tests
-        - tempest-full-xena-extra-tests
     periodic:
       jobs:
         - tempest-all
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index c5fc06399b..0aa1aaca1a 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/yoga
 
-- job:
-    name: tempest-full-xena
-    parent: tempest-full-py3
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/xena
-
 - job:
     name: tempest-full-2023-1-extra-tests
     parent: tempest-extra-tests
@@ -41,12 +35,6 @@
     nodeset: openstack-single-node-focal
     override-checkout: stable/yoga
 
-- job:
-    name: tempest-full-xena-extra-tests
-    parent: tempest-extra-tests
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/xena
-
 - job:
     name: tempest-slow-2023-1
     parent: tempest-slow-py3
@@ -71,12 +59,6 @@
     nodeset: openstack-two-node-focal
     override-checkout: stable/yoga
 
-- job:
-    name: tempest-slow-xena
-    parent: tempest-slow-py3
-    nodeset: openstack-two-node-focal
-    override-checkout: stable/xena
-
 - job:
     name: tempest-full-py3
     parent: devstack-tempest