From 7086815c74e325af51ccaa5c1c9ea3419afe6500 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 24 Sep 2024 21:35:47 -0500
Subject: [PATCH] [libvirt] Add 2023.1 overrides

Recently we fixed the libvirt.sh script
and removed the conditionals cgroup commands
which were introduced for smooth transition
to Jammy and cgroups v2

https://review.opendev.org/c/openstack/openstack-helm-infra/+/929401

But because we didn't have overrides for 2023.1
we used to run 2023.1 with the default libvirt image
openstackhelm/libvirt:latest-ubuntu_focal
which does not work with cgroups v2 on the host
system with this recent fix (see above).

So the 2023.1 Ubuntu Jammy compute-kit test jobs fails.
This PR fixes this job by means of introducing
explicit image overrides for 2023.1.

Change-Id: Ie81f8fb412362388274ea92ad7fa5d3d176c0441
---
 libvirt/Chart.yaml                                |  2 +-
 libvirt/values_overrides/2023.1-ubuntu_focal.yaml |  5 +++++
 libvirt/values_overrides/2023.1-ubuntu_jammy.yaml |  5 +++++
 releasenotes/notes/libvirt.yaml                   |  1 +
 zuul.d/jobs.yaml                                  | 12 ++++++++++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 libvirt/values_overrides/2023.1-ubuntu_focal.yaml
 create mode 100644 libvirt/values_overrides/2023.1-ubuntu_jammy.yaml

diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml
index 4922359de..c13a9fede 100644
--- a/libvirt/Chart.yaml
+++ b/libvirt/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm libvirt
 name: libvirt
-version: 0.1.38
+version: 0.1.39
 home: https://libvirt.org
 sources:
   - https://libvirt.org/git/?p=libvirt.git;a=summary
diff --git a/libvirt/values_overrides/2023.1-ubuntu_focal.yaml b/libvirt/values_overrides/2023.1-ubuntu_focal.yaml
new file mode 100644
index 000000000..950476dbe
--- /dev/null
+++ b/libvirt/values_overrides/2023.1-ubuntu_focal.yaml
@@ -0,0 +1,5 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal
+...
diff --git a/libvirt/values_overrides/2023.1-ubuntu_jammy.yaml b/libvirt/values_overrides/2023.1-ubuntu_jammy.yaml
new file mode 100644
index 000000000..fb478472c
--- /dev/null
+++ b/libvirt/values_overrides/2023.1-ubuntu_jammy.yaml
@@ -0,0 +1,5 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:2023.1-ubuntu_jammy
+...
diff --git a/releasenotes/notes/libvirt.yaml b/releasenotes/notes/libvirt.yaml
index de8fbd5f2..7185a9f32 100644
--- a/releasenotes/notes/libvirt.yaml
+++ b/releasenotes/notes/libvirt.yaml
@@ -39,4 +39,5 @@ libvirt:
   - 0.1.36 Allow to generate dynamic config options
   - 0.1.37 Make readiness probes more tiny
   - 0.1.38 Implement daemonset overrides for libvirt
+  - 0.1.39 Add 2023.1 overrides for Ubuntu Focal and Jammy
 ...
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8c4f1b94e..9b31a06ba 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -359,6 +359,18 @@
       - ^libvirt/.*
       - ^openvswitch/.*
 
+- job:
+    name: openstack-helm-infra-compute-kit-2023-1-ubuntu_jammy
+    parent: openstack-helm-compute-kit-2023-1-ubuntu_jammy
+    files:
+      - ^helm-toolkit/.*
+      - ^roles/.*
+      - ^rabbitmq/.*
+      - ^mariadb/.*
+      - ^memcached/.*
+      - ^libvirt/.*
+      - ^openvswitch/.*
+
 - job:
     name: openstack-helm-infra-cinder-2024-1-ubuntu_jammy
     description: |