From 6ffb4fa7fb2db01e86feac09563a1dc0167cb650 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 13 Apr 2022 18:07:03 -0500
Subject: [PATCH] End support for stable/ussuri

This marks the end of support for stable/ussuri
which is EM now[1]. This remove the stable/ussuri
jobs which are failing due to bug#1968798 and also
adds relesenote to mark the end of support of Ussuri.

[1] https://releases.openstack.org/

Change-Id: Ieeb4da8859d44470c5cb67a62f2dcfd7786daf3a
---
 .../end-of-support-for-ussuri-68583f47805eff02.yaml | 13 +++++++++++++
 zuul.d/project.yaml                                 |  3 ---
 zuul.d/stable-jobs.yaml                             |  6 ------
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/end-of-support-for-ussuri-68583f47805eff02.yaml

diff --git a/releasenotes/notes/end-of-support-for-ussuri-68583f47805eff02.yaml b/releasenotes/notes/end-of-support-for-ussuri-68583f47805eff02.yaml
new file mode 100644
index 0000000000..1a750d947a
--- /dev/null
+++ b/releasenotes/notes/end-of-support-for-ussuri-68583f47805eff02.yaml
@@ -0,0 +1,13 @@
+---
+prelude: |
+    This is an intermediate release during the Zed development cycle to
+    mark the end of support for EM Ussuri release in Tempest.
+    After this release, Tempest will support below OpenStack Releases:
+
+    * Yoga
+    * Xena
+    * Wallaby
+    * Victoria
+
+    Current development of Tempest is for OpenStack Zed development
+    cycle.
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f687cb1aba..eb8b79321b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -43,8 +43,6 @@
             irrelevant-files: *tempest-irrelevant-files
         - tempest-full-victoria-py3:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-full-ussuri-py3:
-            irrelevant-files: *tempest-irrelevant-files
         - tempest-multinode-full-py3:
             irrelevant-files: *tempest-irrelevant-files
         - tempest-tox-plugin-sanity-check:
@@ -173,7 +171,6 @@
         - tempest-full-xena
         - tempest-full-wallaby-py3
         - tempest-full-victoria-py3
-        - tempest-full-ussuri-py3
     periodic:
       jobs:
         - tempest-all
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index f3b5716e70..808645811d 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -19,12 +19,6 @@
     parent: tempest-full-py3
     override-checkout: stable/victoria
 
-- job:
-    name: tempest-full-ussuri-py3
-    parent: tempest-full-py3
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/ussuri
-
 - job:
     name: tempest-full-py3
     parent: devstack-tempest