From 117b98b6366e361b2e51854eefd3d8457c486c99 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 12 Jan 2024 12:37:23 +0000
Subject: [PATCH 1/4] CI: Build stackhpc-kayobe-config image on push to release
 branches

This provides us with an image for each release branch that we can use
in upgrade testing.
---
 .github/workflows/stackhpc-build-kayobe-image.yml     | 7 ++++++-
 releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml

diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml
index 98f35f7c0..323ba6993 100644
--- a/.github/workflows/stackhpc-build-kayobe-image.yml
+++ b/.github/workflows/stackhpc-build-kayobe-image.yml
@@ -5,6 +5,11 @@
 name: Build kayobe image
 
 on:
+  push:
+    branches:
+      # NOTE(upgrade): Reference only the current release branch here.
+      - stackhpc/yoga
+
   workflow_call:
     inputs:
       http_proxy:
@@ -32,7 +37,7 @@ env:
 jobs:
   build-kayobe-image:
     name: Build kayobe image
-    if: inputs.if
+    if: inputs.if || github.repository == 'stackhpc/stackhpc-kayobe-config' && github.event_name == 'push'
     runs-on: ubuntu-20.04
     permissions:
       contents: read
diff --git a/releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml b/releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml
new file mode 100644
index 000000000..97595f3a9
--- /dev/null
+++ b/releasenotes/notes/kayobe-image-f1227adacb28f40b.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    StackHPC Kayobe Configuration container images for CI/CD with `Kayobe
+    Automation <https://github.com/stackhpc/kayobe-automation>`_ are now
+    published to GitHub Container Registry (GHCR) at
+    ghcr.io/stackhpc/stackhpc-kayobe-config. The image is tagged with the name
+    of the release branch, e.g. ``stackhpc/yoga``.

From 87810cbd0eee44c198a19c696112f4f77334eab9 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 12 Jan 2024 20:26:46 +0000
Subject: [PATCH 2/4] Terraform aio: Make instance volume size configurable

This is necessary for upgrade jobs that require a larger volume.
---
 terraform/aio/vm.tf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/terraform/aio/vm.tf b/terraform/aio/vm.tf
index b4d1ba7cc..676aff1c3 100644
--- a/terraform/aio/vm.tf
+++ b/terraform/aio/vm.tf
@@ -33,6 +33,11 @@ variable "aio_vm_subnet" {
   type = string
 }
 
+variable "aio_vm_volume_size" {
+  type = number
+  default = 35
+}
+
 locals {
   image_is_uuid = length(regexall("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", var.aio_vm_image)) > 0
 }
@@ -59,7 +64,7 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
   block_device {
     uuid                  = local.image_is_uuid ? var.aio_vm_image: data.openstack_images_image_v2.image[0].id
     source_type           = "image"
-    volume_size           = 35
+    volume_size           = var.aio_vm_volume_size
     boot_index            = 0
     destination_type      = "volume"
     delete_on_termination = true

From a0a8abf8445042aa22b694b9887c2cd0f51a2cd8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 15 Jan 2024 11:48:58 +0000
Subject: [PATCH 3/4] zed: CI: Update kayobe image build CI branch pattern

---
 .github/workflows/stackhpc-build-kayobe-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml
index 67eb8e22d..3aeca9dd8 100644
--- a/.github/workflows/stackhpc-build-kayobe-image.yml
+++ b/.github/workflows/stackhpc-build-kayobe-image.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       # NOTE(upgrade): Reference only the current release branch here.
-      - stackhpc/yoga
+      - stackhpc/zed
 
   workflow_call:
     inputs:

From c08f2967bb67f9ef3909e7f32aed61a789a6511e Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 15 Jan 2024 11:49:38 +0000
Subject: [PATCH 4/4] 2023.1: CI: Update kayobe image build CI branch pattern

---
 .github/workflows/stackhpc-build-kayobe-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml
index 3aeca9dd8..cce64e46a 100644
--- a/.github/workflows/stackhpc-build-kayobe-image.yml
+++ b/.github/workflows/stackhpc-build-kayobe-image.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       # NOTE(upgrade): Reference only the current release branch here.
-      - stackhpc/zed
+      - stackhpc/2023.1
 
   workflow_call:
     inputs: