From c0ff458b051ba414ff8e08d92b6e4a613fef0735 Mon Sep 17 00:00:00 2001
From: OpenStack Release Bot <infra-root@openstack.org>
Date: Tue, 5 Mar 2024 19:24:41 +0000
Subject: [PATCH] reno: Update master for Unmaintained branches

The stable/victoria and stable/wallaby branches have been deleted,
so reno can't find their release notes.  Use the victoria-eom and
wallaby-eom tags to indicate the end of the
Cinder project's maintenance of these series.

Also fix our override for the reno closed_branch_tag_re to include
the -eom tags. Add the changed reno.yaml file to all relevant
irrelevant-files lists.

This strategy is what we used for the yoga transition, and was
discussed at a cinder weekly meeting:
https://meetings.opendev.org/irclogs/%23openstack-meeting-alt/%23openstack-meeting-alt.2024-02-07.log.html#t2024-02-07T14:06:09

Change-Id: I505b7cc12888d2373a0550b40bb945d75bb11067
---
 .zuul.yaml                       | 5 +++++
 releasenotes/source/victoria.rst | 2 +-
 releasenotes/source/wallaby.rst  | 2 +-
 reno.yaml                        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 250d34953ac..e83a94115d5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,6 +23,7 @@
               - ^cinder/tests/unit.*$
               - ^doc/.*$
               - ^releasenotes/.*$
+              - ^reno.yaml$
         - openstack-tox-functional-py310:
             irrelevant-files: *functional-irrelevant-files
         - cinder-rally-task:
@@ -39,6 +40,7 @@
               - ^cinder/tests/unit.*$
               - ^doc/.*$
               - ^releasenotes/.*$
+              - ^reno.yaml$
         - cinder-plugin-ceph-tempest:
             irrelevant-files: &gate-irrelevant-files
               - ^(test-|)requirements.txt$
@@ -51,6 +53,7 @@
               - ^cinder/tests/unit.*$
               - ^doc/.*$
               - ^releasenotes/.*$
+              - ^reno.yaml$
               - ^setup.cfg$
               - ^tools/.*$
               - ^tox.ini$
@@ -71,6 +74,7 @@
               - ^cinder/tests/unit.*$
               - ^doc/.*$
               - ^releasenotes/.*$
+              - ^reno.yaml$
               - ^tools/.*$
         - cinder-tempest-plugin-lvm-lio-barbican-fips:
             voting: false
@@ -150,6 +154,7 @@
       - ^cinder/locale/.*$
       - ^doc/.*$
       - ^releasenotes/.*$
+      - ^reno.yaml$
       - ^setup.cfg$
       - ^tools/.*$
       - ^tox.ini$
diff --git a/releasenotes/source/victoria.rst b/releasenotes/source/victoria.rst
index 4efc7b6f3b1..6d20e155388 100644
--- a/releasenotes/source/victoria.rst
+++ b/releasenotes/source/victoria.rst
@@ -3,4 +3,4 @@ Victoria Series Release Notes
 =============================
 
 .. release-notes::
-   :branch: stable/victoria
+   :branch: victoria-eom
diff --git a/releasenotes/source/wallaby.rst b/releasenotes/source/wallaby.rst
index d77b5659955..018303da0c9 100644
--- a/releasenotes/source/wallaby.rst
+++ b/releasenotes/source/wallaby.rst
@@ -3,4 +3,4 @@ Wallaby Series Release Notes
 ============================
 
 .. release-notes::
-   :branch: stable/wallaby
+   :branch: wallaby-eom
diff --git a/reno.yaml b/reno.yaml
index 4cd33255c3a..1f7c34e072e 100644
--- a/reno.yaml
+++ b/reno.yaml
@@ -1,7 +1,7 @@
 ---
 # Ignore the kilo-eol tag because that branch does not work with reno
 # and contains no release notes.
-closed_branch_tag_re: "(.+)(?<!kilo)-eol"
+closed_branch_tag_re: "(.+)(?<!kilo)-eo[lm]"
 template: |
   ---
   prelude: >