From a46f9f10d591c7decaf7d52692427274c6606c2e Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 24 Apr 2024 18:13:42 -0500
Subject: [PATCH] Reorganize building Openstack master images

- Use same base jobs that we use for latest releases
- Use Ubuntu Jammy as base OS

Change-Id: I959383a4472c5c6d56db38afb795d77e09cf67d5
---
 zuul.d/openstack-loci.yaml   | 55 -------------------------
 zuul.d/openstack-master.yaml | 79 ++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 55 deletions(-)
 create mode 100644 zuul.d/openstack-master.yaml

diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml
index 544a0432..d89ca041 100644
--- a/zuul.d/openstack-loci.yaml
+++ b/zuul.d/openstack-loci.yaml
@@ -395,61 +395,6 @@
 # Real jobs #
 #############
 
-# Master - Jammy
-- job:
-    name: openstack-helm-images-build-openstack-loci-master-ubuntu_jammy
-    description: Build LOCI master jammy images
-    parent: openstack-helm-images-build-openstack-loci-master
-    match-on-config-updates: true
-    vars: &build_master_jammy_images
-      currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
-      branchname: "master"
-      shortbranchname: "master"
-      distroname: "ubuntu_jammy"
-      from: "docker.io/ubuntu:22.04"
-      python3: "yes"
-      #172.17.0.1 is default docker0 ip.
-      wheels_location: "http://172.17.0.1:8080/wheels.tar.gz"
-      base_repository: "base"
-      ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
-      ceph_key: "http://download.ceph.com/keys/release.asc"
-      base_docker_image:
-        - <<: *base_image
-      prep_docker_images:
-        - <<: *prep_requirements_project
-      docker_images:
-        - <<: *requirements_project
-        - <<: *keystone_project
-        - <<: *glance_project
-        - <<: *cinder_project
-        - <<: *nova_project
-        - <<: *neutron_project
-        - <<: *horizon_project
-        - <<: *heat_project
-        - <<: *barbican_project
-        - <<: *placement_project
-        - <<: *monasca_api_project
-        # Watcher depends on retired python-ceilometerclient not compatible with current master constraints
-        # - <<: *watcher_project
-        - <<: *cyborg_project
-        - <<: *masakari_project
-        - <<: *manila_project
-        - <<: *tacker_project
-
-- job:
-    name: openstack-helm-images-upload-openstack-loci-master-ubuntu_jammy
-    description: Build and upload LOCI master jammy images
-    parent: openstack-helm-images-upload-openstack-loci-master
-    vars: *build_master_jammy_images
-    files: *loci-files
-
-- job:
-    name: openstack-helm-images-promote-openstack-loci-master-ubuntu_jammy
-    parent: openstack-helm-images-promote-openstack-loci-master
-    description: Promote previously published LOCI master jammy images
-    vars: *build_master_jammy_images
-    files: *loci-files
-
 ##########
 # 2023.1 #
 ##########
diff --git a/zuul.d/openstack-master.yaml b/zuul.d/openstack-master.yaml
new file mode 100644
index 00000000..99f25a88
--- /dev/null
+++ b/zuul.d/openstack-master.yaml
@@ -0,0 +1,79 @@
+---
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+- project:
+    check:
+      jobs:
+        - openstack-helm-images-build-openstack-master-ubuntu_jammy
+    gate:
+      jobs:
+        - openstack-helm-images-upload-openstack-master-ubuntu_jammy
+    promote:
+      jobs:
+        - openstack-helm-images-promote-openstack-master-ubuntu_jammy
+    periodic-weekly:
+      jobs:
+        - openstack-helm-images-upload-openstack-master-ubuntu_jammy
+        - openstack-helm-images-promote-openstack-master-ubuntu_jammy:
+            dependencies:
+              - openstack-helm-images-upload-openstack-master-ubuntu_jammy
+
+- job:
+    name: openstack-helm-images-build-openstack-master-ubuntu_jammy
+    description: Build master Jammy images
+    parent: openstack-helm-images-build-openstack-ubuntu_jammy
+    vars: &build_vars
+      branchname: "master"
+      shortbranchname: "master"
+      openstack_docker_images:
+        - barbican
+        - cinder
+        - cyborg
+        - designate
+        - glance
+        - heat
+        - horizon
+        - ironic
+        - keystone
+        - magnum
+        - manila
+        - masakari
+        - masakari_monitors
+        - monasca_api
+        - neutron
+        - nova
+        - placement
+        - requirements
+        - tacker
+    files: &openstack_files
+      - ^openstack/loci/.*
+      - zuul.d/openstack-master.yaml
+      - zuul.d/openstack-base.yaml
+      - zuul.d/playbooks/build-openstack.yml
+      - zuul.d/playbooks/vars-openstack.yml
+      - zuul.d/playbooks/Dockerfile_base
+
+- job:
+    name: openstack-helm-images-upload-openstack-master-ubuntu_jammy
+    parent: openstack-helm-images-upload-openstack-ubuntu_jammy
+    description: Build and upload master Jammy images
+    vars: *build_vars
+    files: *openstack_files
+
+- job:
+    name: openstack-helm-images-promote-openstack-master-ubuntu_jammy
+    parent: openstack-helm-images-promote-openstack-ubuntu_jammy
+    description: Promote previously published master Jammy images
+    vars: *build_vars
+    files: *openstack_files