From 971f99f584e014a231871c31b3adfaaf5a65c6f4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 27 Nov 2023 16:51:15 +0900
Subject: [PATCH] Remove publish-openstack-octavia-amphora-image jobs

These jobs run only in master. The current definition is causing
the following warnings.

  All regular expressions must conform to RE2 syntax, but an
  expression using the deprecated Perl-style syntax has been detected.
  Adjust the configuration to conform to RE2 syntax.

  The RE2 syntax error is: invalid perl operator: (?!

NOTE(elod.illes): octavia-amphora-image-build-live-centos-8-stream job
also needed to be removed as meanwhile CentOS Stream 8 became End of
Life and centos-8-stream nodeset was removed from Zuul.

Conflicts:
  zuul.d/jobs.yaml
  zuul.d/projects.yaml

Change-Id: I5c882abd9ed2f36ae6ef70279f98a157d9910fd8
(cherry picked from commit 281379c6df0a7c2a1b1f902ee2500ef5150464d8)
(cherry picked from commit cb79e7d76b5a50724ee09ead30906583882e80e7)
(cherry picked from commit 8cc4bc994cea642bd344732df76698dfeb8ff4a6)
---
 zuul.d/jobs.yaml     | 43 -------------------------------------------
 zuul.d/projects.yaml |  4 ----
 2 files changed, 47 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6dead1ace2..5b51659ad9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,33 +1,3 @@
-- job:
-    name: publish-openstack-octavia-amphora-image
-    parent: publish-openstack-artifacts
-    run: playbooks/image-build/run.yaml
-    post-run: playbooks/image-build/post.yaml
-    required-projects:
-        - openstack/diskimage-builder
-        - openstack/octavia
-        - openstack/octavia-lib
-
-- job:
-    name: publish-openstack-octavia-amphora-image-focal
-    parent: publish-openstack-octavia-amphora-image
-    nodeset: ubuntu-focal
-    description: |
-      Publish Ubuntu Focal (20.04) based amphora image to tarballs.o.o.
-    vars:
-        amphora_os: ubuntu
-        amphora_os_release: focal
-
-- job:
-    name: publish-openstack-octavia-amphora-image-centos-8-stream
-    nodeset: centos-8-stream
-    parent: publish-openstack-octavia-amphora-image
-    description: |
-      Publish CentOS 8 Stream based amphora image to tarballs.o.o.
-    vars:
-        amphora_os: centos
-        amphora_os_release: 8-stream
-
 - job:
     name: octavia-grenade
     parent: grenade
@@ -164,19 +134,6 @@
     required-projects:
         - openstack/diskimage-builder
 
-- job:
-    name: octavia-amphora-image-build-live-centos-8-stream
-    parent: octavia-amphora-image-build
-    nodeset: centos-8-stream
-    description: |
-      Builds a CentOS 8 Stream amphora image using diskimage-builder from Git
-      master. This job does not publish the image.
-    required-projects:
-        - openstack/diskimage-builder
-    vars:
-        amphora_os: centos
-        amphora_os_release: 8-stream
-
 - job:
     name: octavia-v2-dsvm-scenario-nftables
     parent: octavia-v2-dsvm-scenario
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 6752a79fe4..c23dbf2da6 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -99,10 +99,6 @@
         - octavia-grenade
     periodic:
       jobs:
-        - publish-openstack-octavia-amphora-image-focal:
-            branches: ^(?!stable/.*).*$
-        - publish-openstack-octavia-amphora-image-centos-8-stream:
-            branches: ^(?!stable/.*).*$
         - octavia-amphora-image-build
         - octavia-grenade-ffu
 # Putting octavia-v2-dsvm-scenario-fips in periodic as centos 8 is too slow