From 4cfb81939e24df0c37ad151c75c202a6b6876917 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 2 May 2024 11:34:08 -0500
Subject: [PATCH] Build Octavia image

Change-Id: I87bf5bb1eaf6acf2250c0232eae11beef7c19ebc
---
 zuul.d/openstack-2024.1-ubuntu_jammy.yaml | 23 ++++++++++++-----------
 zuul.d/openstack-master-ubuntu_jammy.yaml | 23 ++++++++++++-----------
 zuul.d/playbooks/vars-openstack.yml       | 10 ++++++++++
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/zuul.d/openstack-2024.1-ubuntu_jammy.yaml b/zuul.d/openstack-2024.1-ubuntu_jammy.yaml
index e31c8674..fe4602c4 100644
--- a/zuul.d/openstack-2024.1-ubuntu_jammy.yaml
+++ b/zuul.d/openstack-2024.1-ubuntu_jammy.yaml
@@ -46,22 +46,23 @@
       ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
       ceph_key: "http://download.ceph.com/keys/release.asc"
       openstack_docker_images:
-        - keystone
-        - glance
-        - cinder
-        - designate
-        - nova
-        - ironic
-        - neutron
-        - horizon
-        - heat
         - barbican
-        - placement
+        - cinder
         - cyborg
+        - designate
+        - glance
+        - heat
+        - horizon
+        - ironic
+        - keystone
         - magnum
+        - manila
         - masakari
         - masakari_monitors
-        - manila
+        - neutron
+        - nova
+        - octavia
+        - placement
         - tacker
     files: &files_2024_1_ubuntu_jammy
       - zuul.d/openstack-2024.1-ubuntu_jammy.yaml
diff --git a/zuul.d/openstack-master-ubuntu_jammy.yaml b/zuul.d/openstack-master-ubuntu_jammy.yaml
index 4c8f8d9b..d65f87aa 100644
--- a/zuul.d/openstack-master-ubuntu_jammy.yaml
+++ b/zuul.d/openstack-master-ubuntu_jammy.yaml
@@ -41,22 +41,23 @@
       ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
       ceph_key: "http://download.ceph.com/keys/release.asc"
       openstack_docker_images:
-        - keystone
-        - glance
-        - cinder
-        - designate
-        - nova
-        - ironic
-        - neutron
-        - horizon
-        - heat
         - barbican
-        - placement
+        - cinder
         - cyborg
+        - designate
+        - glance
+        - heat
+        - horizon
+        - ironic
+        - keystone
         - magnum
+        - manila
         - masakari
         - masakari_monitors
-        - manila
+        - neutron
+        - nova
+        - octavia
+        - placement
         - tacker
     files: &files_master_ubuntu_jammy
       - zuul.d/openstack-master-ubuntu_jammy.yaml
diff --git a/zuul.d/playbooks/vars-openstack.yml b/zuul.d/playbooks/vars-openstack.yml
index 9371772f..89275395 100644
--- a/zuul.d/playbooks/vars-openstack.yml
+++ b/zuul.d/playbooks/vars-openstack.yml
@@ -295,3 +295,13 @@ openstack_docker_images_dict:
       - "WHEELS='{{ wheels_location }}'"
       - "KEEP_ALL_WHEELS=yes"
     tags: *imagetag
+  octavia:
+    context: "."
+    repository: openstackhelm/octavia
+    build_args:
+      - "FROM='{{ base_repository }}:{{ shortbranchname }}-{{ distroname }}'"
+      - "PROJECT='octavia'"
+      - "PROJECT_REF={{ branchname }}"
+      - "WHEELS='{{ wheels_location }}'"
+      - "KEEP_ALL_WHEELS=yes"
+    tags: *imagetag