From 281379c6df0a7c2a1b1f902ee2500ef5150464d8 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: (?!

Change-Id: I5c882abd9ed2f36ae6ef70279f98a157d9910fd8
---
 zuul.d/jobs.yaml     | 40 ----------------------------------------
 zuul.d/projects.yaml |  4 ----
 2 files changed, 44 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c4d2bcd947..e90624c35b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,43 +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-jammy
-    parent: publish-openstack-octavia-amphora-image
-    nodeset: ubuntu-jammy
-    description: |
-      Publish Ubuntu Jammy (22.04) based amphora image to tarballs.o.o.
-    vars:
-        amphora_os: ubuntu
-        amphora_os_release: jammy
-
-- job:
-    name: publish-openstack-octavia-amphora-image-centos-9-stream
-    nodeset: centos-9-stream
-    parent: publish-openstack-octavia-amphora-image
-    description: |
-      Publish CentOS 9 Stream based amphora image to tarballs.o.o.
-    vars:
-        amphora_os: centos
-        amphora_os_release: 9-stream
-
 - job:
     name: octavia-grenade
     parent: grenade
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f3a99cd8bd..4fe55e6822 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -118,10 +118,6 @@
         - octavia-grenade
     periodic:
       jobs:
-        - publish-openstack-octavia-amphora-image-focal:
-            branches: ^(?!stable/.*).*$
-        - publish-openstack-octavia-amphora-image-centos-9-stream:
-            branches: ^(?!stable/.*).*$
         - octavia-amphora-image-build
 # Putting octavia-v2-dsvm-scenario-fips in periodic as centos 8 is too slow
         - octavia-v2-dsvm-scenario-fips: