From a81d150329a56afa4dc04cfd2f412c7d46575176 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 24 Apr 2025 11:16:37 -0500
Subject: [PATCH] Remove 2023.2 jobs

2023.2 end of life is coming (estimated at Apr/30/2025)

Change-Id: Ie304476edabc18f0b21eaf419338c752544a8a0d
---
 README.rst                  | 12 ++++--
 ceph-adapter-rook/README.md |  1 +
 zuul.d/2023.2.yaml          | 76 -------------------------------------
 zuul.d/project.yaml         |  5 ---
 4 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100644 zuul.d/2023.2.yaml

diff --git a/README.rst b/README.rst
index e64cc0289e..d34222dda2 100644
--- a/README.rst
+++ b/README.rst
@@ -23,10 +23,6 @@ that are tested and proved to work.
      - Host OS
      - Image OS
      - Kubernetes version
-   * - 2023.2 (Bobcat)
-     - Ubuntu Jammy
-     - Ubuntu Jammy
-     - >=1.29,<=1.31
    * - 2024.1 (Caracal)
      - Ubuntu Jammy
      - Ubuntu Jammy
@@ -35,6 +31,14 @@ that are tested and proved to work.
      - Ubuntu Jammy
      - Ubuntu Jammy
      - >=1.29,<=1.31
+   * - 2025.1 (Epoxy)
+     - Ubuntu Jammy
+     - Ubuntu Jammy
+     - >=1.29,<=1.31
+   * - 2025.1 (Epoxy)
+     - Ubuntu Noble
+     - Ubuntu Noble
+     - >=1.29,<=1.31
 
 Communication
 -------------
diff --git a/ceph-adapter-rook/README.md b/ceph-adapter-rook/README.md
index 7a3e5b5579..88e225e977 100644
--- a/ceph-adapter-rook/README.md
+++ b/ceph-adapter-rook/README.md
@@ -11,6 +11,7 @@ have to provision a minimal set of assets like Ceph admin key and
 Ceph client config.
 
 # Usage
+```
 helm upgrade --install ceph-adapter-rook ./ceph-adapter-rook \
   --namespace=openstack
 ```
diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml
deleted file mode 100644
index d75bc9c5f0..0000000000
--- a/zuul.d/2023.2.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- job:
-    name: openstack-helm-keystone-ldap-2023-2-ubuntu_jammy
-    parent: openstack-helm-keystone-ldap
-    nodeset: openstack-helm-1node-ubuntu_jammy
-    vars:
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-        feature_gates: ldap
-
-- job:
-    name: openstack-helm-horizon-2023-2-ubuntu_jammy
-    parent: openstack-helm-horizon
-    nodeset: openstack-helm-1node-ubuntu_jammy
-    vars:
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-        feature_gates: logo
-
-- job:
-    name: openstack-helm-cinder-2023-2-ubuntu_jammy
-    parent: openstack-helm-cinder-rook
-    vars:
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-
-- job:
-    name: openstack-helm-compute-kit-2023-2-ubuntu_jammy
-    parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
-    vars:
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-
-- job:
-    name: openstack-helm-compute-kit-metallb-2023-2-ubuntu_jammy
-    parent: openstack-helm-compute-kit
-    nodeset: openstack-helm-1node-3nodes-ubuntu_jammy
-    vars:
-      metallb_setup: true
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-
-- job:
-    name: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy
-    parent: openstack-helm-compute-kit-ovn
-    nodeset: openstack-helm-3nodes-ubuntu_jammy
-    vars:
-      osh_params:
-        openstack_release: "2023.2"
-        container_distro_name: ubuntu
-        container_distro_version: jammy
-        feature_gates: ovn
-...
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 92c8db7328..191f5782f0 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,12 +21,7 @@
       jobs:
         - openstack-helm-linter
         - openstack-helm-bandit
-        # # 2023.2
-        # - openstack-helm-cinder-2023-2-ubuntu_jammy  # 5 nodes rook
-        # - openstack-helm-compute-kit-2023-2-ubuntu_jammy  # 3 nodes
-        # - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy  # 3 nodes
         # 2024.1
-        - openstack-helm-keystone-ldap-2023-2-ubuntu_jammy  # 1 node
         - openstack-helm-tls-2024-1-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-cinder-2024-1-ubuntu_jammy  # 5 nodes rook
         - openstack-helm-compute-kit-2024-1-ubuntu_jammy  # 3 nodes