From 2a458c8bea6a4aec3bd60d570e5d6045ffe94193 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Thu, 7 Mar 2024 16:55:48 +0530
Subject: [PATCH] Fix branch regex to cover unmaintained branches

Required to keep running jobs when branches are
renamed from stable to unmaintained.

Also drop references for TripleO projects as
dropped from zuul config[1].

[1] https://review.opendev.org/c/openstack/project-config/+/910270

Related-Bug: #2056276
Change-Id: Ie5a92efa3a9b8dbdd9f2783380ce0c13ca264258
---
 zuul.d/devstack-tobiko-minimal.yaml | 4 ++--
 zuul.d/devstack-tobiko-neutron.yaml | 4 ++--
 zuul.d/devstack-tobiko-octavia.yaml | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index 52fdaa0..ba77802 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -20,7 +20,7 @@
     nodeset: devstack-tobiko-jammy
     voting: true
     branches:
-      regex: ^(stable/(wallaby|xena|yoga|zed|2023.1)).*$
+      regex: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
       negate: true
     description: |
       Minimal Devstack Tobiko Plugin job.
@@ -100,7 +100,7 @@
     parent: devstack
     nodeset: devstack-tobiko-focal
     voting: true
-    branches: ^(stable/(wallaby|xena|yoga|zed|2023.1)).*$
+    branches: ^(unmaintained|stable/(wallaby|xena|yoga|zed|2023.1)).*$
     description: |
       Minimal Devstack Tobiko Plugin job Stable branches variant.
 
diff --git a/zuul.d/devstack-tobiko-neutron.yaml b/zuul.d/devstack-tobiko-neutron.yaml
index c25a7b5..bb74562 100644
--- a/zuul.d/devstack-tobiko-neutron.yaml
+++ b/zuul.d/devstack-tobiko-neutron.yaml
@@ -19,7 +19,7 @@
     parent: devstack-tobiko
     voting: true
     branches:
-      regex: ^(stable/(xena|yoga|zed)).*$
+      regex: ^(unmaintained|stable/(xena|yoga|zed)).*$
       negate: true
     description: |
       Base Tobiko devstack job to execute scenario+faults+scenario test cases.
@@ -41,7 +41,7 @@
     name: devstack-tobiko-neutron
     parent: devstack-tobiko
     voting: true
-    branches: ^(stable/(xena|yoga|zed)).*$
+    branches: ^(unmaintained|stable/(xena|yoga|zed)).*$
     description: |
       Base Tobiko devstack job to execute scenario+faults+scenario test cases.
       Variant applied to stable branches xena, yoga and zed.
diff --git a/zuul.d/devstack-tobiko-octavia.yaml b/zuul.d/devstack-tobiko-octavia.yaml
index a6940ce..2a0f1e8 100644
--- a/zuul.d/devstack-tobiko-octavia.yaml
+++ b/zuul.d/devstack-tobiko-octavia.yaml
@@ -24,7 +24,6 @@
       - openstack/octavia-lib
       - openstack/diskimage-builder
       - openstack/ovn-octavia-provider
-      - openstack/tripleo-image-elements
       - openstack/barbican
     irrelevant-files: &IRRELEVANT_FILES
       - ^.*\.rst$
@@ -83,7 +82,6 @@
     required-projects:
       - openstack/octavia
       - openstack/octavia-lib
-      - openstack/tripleo-image-elements
     irrelevant-files: *IRRELEVANT_FILES
     vars:
       devstack_plugins: