From 27dae92b52848785d1bf6bb9960d789e97f6300a Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 2 Jan 2024 03:24:49 -0600
Subject: [PATCH] Fix cyclic job dependencies for 2023.1 focal

Change-Id: I5ed0b389b2208bfcc4bc6909f868750594fb5c58
---
 zuul.d/base.yaml           | 56 ++++++++++++++++++++++++++++++++++++++
 zuul.d/openstack-loci.yaml |  4 +--
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 394841d6..efa51fc2 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -25,6 +25,8 @@
         - openstack-helm-images-cinder-zed-ubuntu_focal
         - openstack-helm-images-compute-kit-2023-1-ubuntu_focal
         - openstack-helm-images-cinder-2023-1-ubuntu_focal
+        - openstack-helm-images-compute-kit-2023-1-ubuntu_jammy
+        - openstack-helm-images-cinder-2023-1-ubuntu_jammy
         - openstack-helm-images-horizon-2023-1-ubuntu_jammy
     gate:
       jobs:
@@ -37,6 +39,8 @@
         - openstack-helm-images-cinder-zed-ubuntu_focal
         - openstack-helm-images-compute-kit-2023-1-ubuntu_focal
         - openstack-helm-images-cinder-2023-1-ubuntu_focal
+        - openstack-helm-images-compute-kit-2023-1-ubuntu_jammy
+        - openstack-helm-images-cinder-2023-1-ubuntu_jammy
         - openstack-helm-images-horizon-2023-1-ubuntu_jammy
     periodic-weekly:
       jobs:
@@ -49,6 +53,8 @@
         - openstack-helm-images-cinder-zed-ubuntu_focal
         - openstack-helm-images-compute-kit-2023-1-ubuntu_focal
         - openstack-helm-images-cinder-2023-1-ubuntu_focal
+        - openstack-helm-images-compute-kit-2023-1-ubuntu_jammy
+        - openstack-helm-images-cinder-2023-1-ubuntu_jammy
         - openstack-helm-images-horizon-2023-1-ubuntu_jammy
     templates:
       - publish-openstack-docs-pti
@@ -365,3 +371,53 @@
       - zuul.d/openstack-loci.yaml
       - mariadb/.*
       - zuul.d/mariadb.yaml
+
+- job:
+    name: openstack-helm-images-compute-kit-2023-1-ubuntu_jammy
+    parent: openstack-helm-compute-kit-2023-1-ubuntu_jammy
+    match-on-config-updates: false
+    dependencies:
+      - name: openstack-helm-images-build-openvswitch
+        soft: true
+      - name: openstack-helm-images-build-openstack-loci-2023-1-ubuntu_jammy
+        soft: true
+      - name: openstack-helm-images-build-mariadb
+        soft: true
+      - name: openstack-helm-images-build-libvirt
+        soft: true
+      - name: openstack-helm-images-upload-openvswitch
+        soft: true
+      - name: openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_jammy
+        soft: true
+      - name: openstack-helm-images-upload-mariadb
+        soft: true
+      - name: openstack-helm-images-upload-libvirt
+        soft: true
+    files:
+      - openvswitch/.*
+      - zuul.d/openvswitch.yaml
+      - ^openstack/loci/.*
+      - zuul.d/openstack-loci.yaml
+      - mariadb/.*
+      - zuul.d/mariadb.yaml
+      - libvirt/.*
+      - zuul.d/libvirt.yaml
+
+- job:
+    name: openstack-helm-images-cinder-2023-1-ubuntu_jammy
+    parent: openstack-helm-cinder-2023-1-ubuntu_jammy
+    match-on-config-updates: false
+    dependencies:
+      - name: openstack-helm-images-build-openstack-loci-2023-1-ubuntu_jammy
+        soft: true
+      - name: openstack-helm-images-build-mariadb
+        soft: true
+      - name: openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_jammy
+        soft: true
+      - name: openstack-helm-images-upload-mariadb
+        soft: true
+    files:
+      - ^openstack/loci/.*
+      - zuul.d/openstack-loci.yaml
+      - mariadb/.*
+      - zuul.d/mariadb.yaml
diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml
index a37d3667..06b74e8d 100644
--- a/zuul.d/openstack-loci.yaml
+++ b/zuul.d/openstack-loci.yaml
@@ -57,13 +57,13 @@
         - openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_focal
         - openstack-helm-images-promote-openstack-loci-2023-1-ubuntu_focal:
             dependencies:
-              - name: openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_focal
               - name: openstack-helm-images-compute-kit-2023-1-ubuntu_focal
               - name: openstack-helm-images-cinder-2023-1-ubuntu_focal
         - openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_jammy
         - openstack-helm-images-promote-openstack-loci-2023-1-ubuntu_jammy:
             dependencies:
-              - name: openstack-helm-images-upload-openstack-loci-2023-1-ubuntu_jammy
+              - name: openstack-helm-images-compute-kit-2023-1-ubuntu_jammy
+              - name: openstack-helm-images-cinder-2023-1-ubuntu_jammy
         - openstack-helm-images-upload-openstack-loci-master-ubuntu_jammy
         - openstack-helm-images-promote-openstack-loci-master-ubuntu_jammy:
             dependencies: