From 21863017818517ef706d6e7f714af10e82700812 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 23 Oct 2023 16:26:16 +0100
Subject: [PATCH 1/9] Rename container promotion workflows to -old

---
 .../{container-promote.yml => container-promote-old.yml}      | 4 ++--
 ...ntainer-promote.yml => dev-pulp-container-promote-old.yml} | 0
 docs/usage/content-workflows.md                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{container-promote.yml => container-promote-old.yml} (95%)
 rename ansible/{dev-pulp-container-promote.yml => dev-pulp-container-promote-old.yml} (100%)

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote-old.yml
similarity index 95%
rename from .github/workflows/container-promote.yml
rename to .github/workflows/container-promote-old.yml
index c600aae9..51cb881c 100644
--- a/.github/workflows/container-promote.yml
+++ b/.github/workflows/container-promote-old.yml
@@ -1,5 +1,5 @@
 ---
-name: Promote container repositories
+name: Promote container repositories (old)
 on:
   workflow_dispatch:
     inputs:
@@ -45,7 +45,7 @@ jobs:
     - name: Promote images from stackhpc-dev to stackhpc namespace in Ark
       run: |
         ansible-playbook -i ansible/inventory \
-        ansible/dev-pulp-container-promote.yml \
+        ansible/dev-pulp-container-promote-old.yml \
         -e dev_pulp_repository_container_promotion_tag="$TAG" \
         -e kolla_container_image_filter="'$FILTER'" \
         -e kolla_base_distros_override="'$DISTROS'" \
diff --git a/ansible/dev-pulp-container-promote.yml b/ansible/dev-pulp-container-promote-old.yml
similarity index 100%
rename from ansible/dev-pulp-container-promote.yml
rename to ansible/dev-pulp-container-promote-old.yml
diff --git a/docs/usage/content-workflows.md b/docs/usage/content-workflows.md
index 2c9f3497..94ddb09a 100644
--- a/docs/usage/content-workflows.md
+++ b/docs/usage/content-workflows.md
@@ -243,7 +243,7 @@ skydive_analyzer_tag: wallaby-20220811T091848
 
     This should only be performed when container images are ready for release.
 
-The [Promote container repositories](https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote.yml) workflow runs on demand.
+The [Promote container repositories](https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote-old.yml) workflow runs on demand.
 It should be run when container images need to be released, typically after a change to [update container image tags](#updating-container-image-tags-in-kayobe-configuration) has been approved.
 It runs the following playbook:
 
@@ -253,7 +253,7 @@ Use GitHub Actions to run this workflow, or to run it manually:
 
 ```
 ansible-playbook -i ansible/inventory \
-ansible/dev-pulp-container-promote.yml
+ansible/dev-pulp-container-promote-old.yml
 ```
 
 ## Other utilities

From e3a2160441990fe6e653ea84231c1d335d73f4a8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 11 Apr 2023 12:25:30 +0100
Subject: [PATCH 2/9] Promote multiple tags simultaneously based on Kayobe
 config

This modifies the container image promotion process to be similar to
package repo promotion. The tags for each image are stored in files in
StackHPC Kayobe configuration (one per base distro), and these are
queried to determine which tag to promote for each image.

This avoids the need to specify tags when promoting images, and will
allow for automatic tag promotion after merges to StackHPC Kayobe
Configuration.
---
 .github/workflows/container-promote.yml       | 60 +++++++++++++++++++
 ansible/dev-pulp-container-promote.yml        | 50 ++++++++++++++++
 .../dev-pulp-container-tag-query-kayobe.yml   | 32 ++++++++++
 ansible/kayobe-container-tag-query.yml        | 42 +++++++++++++
 docs/usage/content-workflows.md               | 31 +++++++++-
 5 files changed, 212 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/container-promote.yml
 create mode 100644 ansible/dev-pulp-container-promote.yml
 create mode 100644 ansible/dev-pulp-container-tag-query-kayobe.yml
 create mode 100644 ansible/kayobe-container-tag-query.yml

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
new file mode 100644
index 00000000..f5e3b210
--- /dev/null
+++ b/.github/workflows/container-promote.yml
@@ -0,0 +1,60 @@
+---
+name: Promote container repositories
+on:
+  workflow_dispatch:
+    inputs:
+      filter:
+        description: Space-separated list of regular expressions matching images to promote
+        type: string
+        required: false
+        default: ""
+      kayobe_config_branch:
+        required: false
+        description: Branch of StackHPC Kayobe configuration to use
+        default: stackhpc/yoga
+      check-mode:
+        description: Check mode
+        type: boolean
+        required: false
+        default: false
+
+env:
+  ANSIBLE_FORCE_COLOR: True
+  ANSIBLE_VAULT_PASSWORD_FILE: ${{ github.workspace }}/vault-pass
+jobs:
+  container-promote:
+    name: Promote container repositories
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Setup Release Train & dependencies
+      uses: ./.github/actions/setup
+      with:
+        vault-password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
+        vault-password-file: ${{ env.ANSIBLE_VAULT_PASSWORD_FILE }}
+
+    - name: Clone StackHPC Kayobe configuration repository
+      uses: actions/checkout@v3
+      with:
+        repository: stackhpc/stackhpc-kayobe-config
+        ref: refs/heads/${{ github.event.inputs.kayobe_config_branch }}
+        path: stackhpc-kayobe-config
+
+    - name: Promote images from stackhpc-dev to stackhpc namespace in Ark
+      run: |
+        args=""
+        if [[ $CHECK_MODE = true ]]; then
+          args="$args --check --diff"
+        fi
+        source venv/bin/activate &&
+        ansible-playbook -i ansible/inventory \
+        ansible/dev-pulp-container-tag-query-kayobe.yml \
+        ansible/dev-pulp-container-promote.yml \
+        -e kolla_container_image_filter="'$FILTER'" \
+        -e kayobe_config_repo_path=./stackhpc-kayobe-config/ \
+        $args
+      env:
+        FILTER: ${{ github.event.inputs.filter }}
+        CHECK_MODE: ${{ inputs.check-mode }}
diff --git a/ansible/dev-pulp-container-promote.yml b/ansible/dev-pulp-container-promote.yml
new file mode 100644
index 00000000..4d11de17
--- /dev/null
+++ b/ansible/dev-pulp-container-promote.yml
@@ -0,0 +1,50 @@
+---
+# This playbook promotes images in the development namespace (stackhpc-dev) to
+# the release namespace (stackhpc). This makes them available to clients.
+# Images with a tag defined by dev_pulp_repository_container_promotion_tags are
+# promoted. dev_pulp_repository_container_promotion_tags is a dict with the
+# following format:
+#
+# dev_pulp_repository_container_promotion_tags:
+#   <image name>:
+#     - <image tag 1>
+#     - <image tag 2>
+
+- name: Promote dev Pulp containers
+  hosts: localhost
+  gather_facts: false
+  tasks:
+    - name: Fail if container images to promote are not defined
+      fail:
+        msg: >
+          The container images to promote must be specified via
+          'dev_pulp_repository_container_promotion_tags'
+      when: dev_pulp_repository_container_promotion_tags is not defined
+
+    - name: Display which tags are being promoted
+      debug:
+        var: "dev_pulp_repository_container_promotion_tags"
+
+    # Copy tags from stackhpc-dev to stackhpc repositories.
+    - import_role:
+        name: stackhpc.pulp.pulp_container_content
+      vars:
+        pulp_url: "{{ dev_pulp_url }}"
+        pulp_username: "{{ dev_pulp_username }}"
+        pulp_password: "{{ dev_pulp_password }}"
+        pulp_container_content: >-
+          {%- set contents = [] -%}
+          {%- for image, tags in dev_pulp_repository_container_promotion_tags.items() -%}
+          {%- set src_image_repo = "stackhpc-dev/" ~ image -%}
+          {%- set dest_image_repo = "stackhpc/" ~ image -%}
+          {%- set content = {
+            "allow_missing": False,
+            "src_repo": src_image_repo,
+            "src_is_push": true,
+            "repository": dest_image_repo,
+            "tags": tags,
+          } -%}
+          {%- set _ = contents.append(content) -%}
+          {%- endfor -%}
+          {{ contents }}
+        pulp_container_content_wait: false
diff --git a/ansible/dev-pulp-container-tag-query-kayobe.yml b/ansible/dev-pulp-container-tag-query-kayobe.yml
new file mode 100644
index 00000000..6b76d383
--- /dev/null
+++ b/ansible/dev-pulp-container-tag-query-kayobe.yml
@@ -0,0 +1,32 @@
+---
+# This playbook queries the Pulp container image tags defined in a Kayobe
+# configuration repository (in etc/kayobe/kolla-image-tags.yml). It then sets
+# the 'dev_pulp_repository_container_promotion_tags' tag map variable based
+# upon those tags, which defines the set of container image tags that
+# will be promoted when the dev-pulp-container-promote.yml playbook is run.
+
+- import_playbook: kayobe-container-tag-query.yml
+
+- name: Set dev Pulp container image tags to promote from Kayobe config tags
+  hosts: localhost
+  gather_facts: true
+  tasks:
+    - name: Set a fact about container image tags to promote
+      set_fact:
+        dev_pulp_repository_container_promotion_tags: >-
+          {{ kayobe_kolla_image_tags |
+             dict2items |
+             selectattr('key', 'in', kolla_container_images_filtered) |
+             items2dict }}
+
+    - name: Display container promotion tags facts
+      debug:
+        var: dev_pulp_repository_container_promotion_tags
+
+    - name: Assert that tags variable is populated
+      assert:
+        that:
+          - dev_pulp_repository_container_promotion_tags | length > 0
+        msg: >-
+          Distribution promotion tag variable
+          'dev_pulp_repository_container_promotion_tags' is empty
diff --git a/ansible/kayobe-container-tag-query.yml b/ansible/kayobe-container-tag-query.yml
new file mode 100644
index 00000000..97821b9c
--- /dev/null
+++ b/ansible/kayobe-container-tag-query.yml
@@ -0,0 +1,42 @@
+---
+# This playbook queries the Pulp container image tags defined in a Kayobe
+# configuration repository (in etc/kayobe/kolla-image-tags.yml). It then sets
+# the 'kayobe_pulp_container_tags' tag map variable based upon those tags.
+#
+# The kayobe-config repository path should be specified via
+# kayobe_config_repo_path.
+
+- name: Query container image tags for Kayobe
+  hosts: localhost
+  gather_facts: True
+  vars:
+    kayobe_config_repo_path: ""
+  tasks:
+    - name: Fail if Kayobe config repo path is not specified
+      fail:
+        msg: >
+          Kayobe config git repository path must be specified via 'kayobe_config_repo_path'.
+      when: not kayobe_config_repo_path
+
+    - name: Fail if Kayobe config repo path is not a directory
+      fail:
+        msg: >
+          Kayobe config git repository path {{ kayobe_config_repo_path }} is not a directory.
+      when: kayobe_config_repo_path is not directory
+
+    - name: List Kayobe Kolla image tags
+      command:
+        cmd: >-
+          {{ kayobe_config_repo_path | realpath }}/tools/kolla-images.py list-tags
+        chdir: "{{ kayobe_config_repo_path | realpath }}"
+      register: list_tags
+      check_mode: false
+      changed_when: false
+
+    - name: Set a fact about Kayobe Kolla image tags
+      set_fact:
+        kayobe_kolla_image_tags: "{{ list_tags.stdout | from_yaml }}"
+
+    - name: Display Kayobe Kolla image tags
+      debug:
+        var: kayobe_kolla_image_tags
diff --git a/docs/usage/content-workflows.md b/docs/usage/content-workflows.md
index 94ddb09a..bbf5b246 100644
--- a/docs/usage/content-workflows.md
+++ b/docs/usage/content-workflows.md
@@ -237,17 +237,42 @@ Alternatively, to update the tag for a specific container, update `etc/kayobe/ko
 skydive_analyzer_tag: wallaby-20220811T091848
 ```
 
-## Promoting container images
+## Promoting container images (Zed release onwards)
 
 !!! note
 
     This should only be performed when container images are ready for release.
 
-The [Promote container repositories](https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote-old.yml) workflow runs on demand.
+The [Promote container repositories](https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote.yml) workflow is triggered automatically when a change is merged to stackhpc-kayobe-config.
+It may also be run on demand.
+
+It runs the following playbooks:
+
+* `dev-pulp-container-tag-query-kayobe.yml`: Query the Pulp container image tags defined in a Kayobe configuration repository and set the tag map variable `dev_pulp_repository_container_promotion_tags` based upon those tags. A path to a Kayobe configuration repository must be specified via `kayobe_config_repo_path`.
+* `dev-pulp-container-promote.yml`: Promote a set of container images from `stackhpc-dev` to `stackhpc` namespace. The tags to be promoted are defined via `dev_pulp_repository_container_promotion_tags`.
+
+Use GitHub Actions to run this workflow, or to run it manually:
+
+```
+ansible-playbook -i ansible/inventory \
+ansible/dev-pulp-container-tag-query-kayobe.yml \
+ansible/dev-pulp-container-promote.yml \
+-e kayobe_config_repo_path=../stackhpc-kayobe-config/
+```
+
+In this example, the Pulp container image tags defined in the `etc/kayobe/kolla-image-tags.yml` file in `../stackhpc-kayobe-config` repository (relative to the current working directory) will be promoted to releases.
+
+## Promoting container images (Yoga release and earlier)
+
+!!! note
+
+    This should only be performed when container images are ready for release.
+
+The [Promote container repositories (old)](https://github.com/stackhpc/stackhpc-release-train/actions/workflows/container-promote-old.yml) workflow runs on demand.
 It should be run when container images need to be released, typically after a change to [update container image tags](#updating-container-image-tags-in-kayobe-configuration) has been approved.
 It runs the following playbook:
 
-* `dev-pulp-container-promote.yml`: Promote a set of container images from `stackhpc-dev` to `stackhpc` namespace. The tag to be promoted is defined via `dev_pulp_repository_container_promotion_tag` which should be specified as an extra variable (`-e`).
+* `dev-pulp-container-promote-old.yml`: Promote a set of container images from `stackhpc-dev` to `stackhpc` namespace. The tag to be promoted is defined via `dev_pulp_repository_container_promotion_tag` which should be specified as an extra variable (`-e`).
 
 Use GitHub Actions to run this workflow, or to run it manually:
 

From df1f57effba79e0e806e18256326c708a66c5366 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 11 Apr 2023 14:40:17 +0100
Subject: [PATCH 3/9] CI: Support check mode for package promotion

---
 .github/workflows/package-promote.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/package-promote.yml b/.github/workflows/package-promote.yml
index b3cf3a22..405d572f 100644
--- a/.github/workflows/package-promote.yml
+++ b/.github/workflows/package-promote.yml
@@ -12,6 +12,11 @@ on:
         required: false
         description: Branch of StackHPC Kayobe configuration to use
         default: stackhpc/wallaby
+      check-mode:
+        description: Check mode
+        type: boolean
+        required: false
+        default: false
 
 env:
   ANSIBLE_FORCE_COLOR: True
@@ -39,11 +44,18 @@ jobs:
 
     - name: Promote package repositories in Ark to release
       run: |
+        args=""
+        if [[ $CHECK_MODE = true ]]; then
+          args="$args --check --diff"
+        fi
+        source venv/bin/activate &&
         ansible-playbook -i ansible/inventory \
         ansible/dev-pulp-repo-version-query-kayobe.yml \
         ansible/dev-pulp-repo-promote.yml \
         -e deb_package_repo_filter="'$FILTER'" \
         -e rpm_package_repo_filter="'$FILTER'" \
-        -e kayobe_config_repo_path=./stackhpc-kayobe-config/
+        -e kayobe_config_repo_path=./stackhpc-kayobe-config/ \
+        $args
       env:
         FILTER: ${{ github.event.inputs.filter }}
+        CHECK_MODE: ${{ inputs.check-mode }}

From 2f33e5d43858be48d85b6762dc55fc5398a5a8dc Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 27 Oct 2023 12:11:16 +0100
Subject: [PATCH 4/9] Rename old container promote workflow

---
 .github/workflows/container-promote-old.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/container-promote-old.yml b/.github/workflows/container-promote-old.yml
index 51cb881c..19b2b064 100644
--- a/.github/workflows/container-promote-old.yml
+++ b/.github/workflows/container-promote-old.yml
@@ -1,5 +1,5 @@
 ---
-name: Promote container repositories (old)
+name: Promote container repositories (pre-Zed)
 on:
   workflow_dispatch:
     inputs:

From 7ccd621297f010ee3376e13fd5970e2d38cbf214 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 27 Oct 2023 11:20:23 +0100
Subject: [PATCH 5/9] docs: Update following container promotion changes

---
 docs/usage/content-howto.md     | 31 ++++++++++++++++---
 docs/usage/content-workflows.md | 55 ++++++++++++++++++++++++++++++---
 2 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/docs/usage/content-howto.md b/docs/usage/content-howto.md
index 220b9480..e35332b9 100644
--- a/docs/usage/content-howto.md
+++ b/docs/usage/content-howto.md
@@ -7,24 +7,47 @@ That is the aim of this page.
 
 Update one or more package repositories to a new version, then build new Kolla container images from those repositories.
 
+If using Yoga release or earlier:
+
 * If the repository URL has changed e.g. a new minor version has been released, add new package repositories to [`package-repos`](https://github.com/stackhpc/stackhpc-release-train/blob/main/ansible/inventory/group_vars/all/package-repos)
 * [Sync package repositories](content-workflows.md#syncing-package-repositories) (optional: runs nightly as a scheduled GitHub Action)
 * [Update Kayobe repository versions](content-workflows.md#updating-package-repository-versions-in-kayobe-configuration)
 * [Build & push Kolla container images](content-workflows.md#building-container-images)
-* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration)
+* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-yoga-release-and-earlier)
 * Test
 * Review & merge Kayobe configuration changes
-* [Promote container images](content-workflows.md#promoting-container-images)
+* [Promote container images](content-workflows.md#promoting-container-images-yoga-release-and-earlier)
+
+If using Zed release onwards:
+
+* If the repository URL has changed e.g. a new minor version has been released, add new package repositories to [`package-repos`](https://github.com/stackhpc/stackhpc-release-train/blob/main/ansible/inventory/group_vars/all/package-repos)
+* [Sync package repositories](content-workflows.md#syncing-package-repositories) (optional: runs nightly as a scheduled GitHub Action)
+* [Update Kayobe repository versions](content-workflows.md#updating-package-repository-versions-in-kayobe-configuration)
+* [Build & push Kolla container images](content-workflows.md#building-container-images)
+* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-zed-release-onwards)
+* Test
+* Review & merge Kayobe configuration changes
+* [Promote container images](content-workflows.md#promoting-container-images-zed-release-onwards)
 
 ## Update Kolla container images
 
 Update one or more Kolla container images, without updating package repositories.
 
+If using Yoga release or earlier:
+
+* [Build & push Kolla container images](content-workflows.md#building-container-images)
+* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-yoga-release-and-earlier)
+* Test
+* Review & merge Kayobe configuration changes
+* [Promote container images](content-workflows.md#promoting-container-images-yoga-release-and-earlier)
+
+If using Zed release onwards:
+
 * [Build & push Kolla container images](content-workflows.md#building-container-images)
-* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration)
+* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-zed-release-onwards)
 * Test
 * Review & merge Kayobe configuration changes
-* [Promote container images](content-workflows.md#promoting-container-images)
+* [Promote container images](content-workflows.md#promoting-container-images-zed-release-onwards)
 
 ## Add a new Kolla container image
 
diff --git a/docs/usage/content-workflows.md b/docs/usage/content-workflows.md
index bbf5b246..be7a70a2 100644
--- a/docs/usage/content-workflows.md
+++ b/docs/usage/content-workflows.md
@@ -204,11 +204,7 @@ ansible/test-pulp-container-sync.yml \
 ansible/test-pulp-container-publish.yml
 ```
 
-## Updating container image tags in Kayobe configuration
-
-!!! note
-
-    This procedure is expected to change.
+## Updating container image tags in Kayobe configuration (Yoga release and earlier)
 
 The image tag used deploy containers may be updated for all images in [etc/kayobe/kolla.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/wallaby/etc/kayobe/kolla.yml), or for specific images in [etc/kayobe/kolla/globals.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/wallaby/etc/kayobe/kolla/globals.yml).
 Currently this is a manual process.
@@ -237,6 +233,55 @@ Alternatively, to update the tag for a specific container, update `etc/kayobe/ko
 skydive_analyzer_tag: wallaby-20220811T091848
 ```
 
+## Updating container image tags in Kayobe configuration (Zed release onwards)
+
+The image tags used deploy containers are defined in [etc/kayobe/kolla-image-tags.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/zed/etc/kayobe/kolla-image-tags.yml).
+Currently updating these is a manual process.
+
+Use the new tag from the [container image build](#building-container-images).
+
+For example, to update the default tag for all images (used where no service-specific tag has been set), update the `openstack` key, and remove all other keys:
+
+```yaml
+# Dict of Kolla image tags to deploy for each service.
+# Each key is the tag variable prefix name, and the value is another dict,
+# where the key is the OS distro and the value is the tag to deploy.
+kolla_image_tags:
+  openstack:
+    rocky-9: zed-rocky-9-20230101T000000
+    ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
+```
+
+Alternatively, update the tag for all containers in a service, e.g. for all `nova` containers:
+
+```yaml
+# Dict of Kolla image tags to deploy for each service.
+# Each key is the tag variable prefix name, and the value is another dict,
+# where the key is the OS distro and the value is the tag to deploy.
+kolla_image_tags:
+  openstack:
+    rocky-9: zed-rocky-9-20230101T000000
+    ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
+  nova:
+    rocky-9: zed-rocky-9-20230102T000000
+    ubuntu-jammy: zed-ubuntu-jammy-20230102T000000
+```
+
+Alternatively, update the tag for a specific container, e.g. for the `nova_compute` container:
+
+```yaml
+# Dict of Kolla image tags to deploy for each service.
+# Each key is the tag variable prefix name, and the value is another dict,
+# where the key is the OS distro and the value is the tag to deploy.
+kolla_image_tags:
+  openstack:
+    rocky-9: zed-rocky-9-20230101T000000
+    ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
+  nova_compute:
+    rocky-9: zed-rocky-9-20230103T000000
+    ubuntu-jammy: zed-ubuntu-jammy-20230103T000000
+```
+
 ## Promoting container images (Zed release onwards)
 
 !!! note

From 849ad7635dd6a6b0a572cf1505803fb4bda09c3a Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 24 Jan 2024 09:59:34 +0000
Subject: [PATCH 6/9] Use underscores for check_mode input

---
 .github/workflows/container-promote.yml | 4 ++--
 .github/workflows/package-promote.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
index f5e3b210..9a3d5558 100644
--- a/.github/workflows/container-promote.yml
+++ b/.github/workflows/container-promote.yml
@@ -12,7 +12,7 @@ on:
         required: false
         description: Branch of StackHPC Kayobe configuration to use
         default: stackhpc/yoga
-      check-mode:
+      check_mode:
         description: Check mode
         type: boolean
         required: false
@@ -57,4 +57,4 @@ jobs:
         $args
       env:
         FILTER: ${{ github.event.inputs.filter }}
-        CHECK_MODE: ${{ inputs.check-mode }}
+        CHECK_MODE: ${{ inputs.check_mode }}
diff --git a/.github/workflows/package-promote.yml b/.github/workflows/package-promote.yml
index 405d572f..973e3120 100644
--- a/.github/workflows/package-promote.yml
+++ b/.github/workflows/package-promote.yml
@@ -12,7 +12,7 @@ on:
         required: false
         description: Branch of StackHPC Kayobe configuration to use
         default: stackhpc/wallaby
-      check-mode:
+      check_mode:
         description: Check mode
         type: boolean
         required: false
@@ -58,4 +58,4 @@ jobs:
         $args
       env:
         FILTER: ${{ github.event.inputs.filter }}
-        CHECK_MODE: ${{ inputs.check-mode }}
+        CHECK_MODE: ${{ inputs.check_mode }}

From 6ddc14ebf639eac35c1161c3f1ae18ee12b24071 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 29 Jan 2024 09:39:09 +0000
Subject: [PATCH 7/9] Remove default for kayobe config branch in container
 promotion workflow

It will only go stale.
---
 .github/workflows/container-promote.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
index 9a3d5558..24c9b2b9 100644
--- a/.github/workflows/container-promote.yml
+++ b/.github/workflows/container-promote.yml
@@ -11,7 +11,6 @@ on:
       kayobe_config_branch:
         required: false
         description: Branch of StackHPC Kayobe configuration to use
-        default: stackhpc/yoga
       check_mode:
         description: Check mode
         type: boolean

From c1ed94316cb74021f06e0efc4eb031a446365f0c Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 29 Jan 2024 15:07:42 +0000
Subject: [PATCH 8/9] Remove use of venv from container promotion workflow

We no longer use virtualenvs in CI.
---
 .github/workflows/container-promote.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
index 24c9b2b9..4ca05874 100644
--- a/.github/workflows/container-promote.yml
+++ b/.github/workflows/container-promote.yml
@@ -47,7 +47,6 @@ jobs:
         if [[ $CHECK_MODE = true ]]; then
           args="$args --check --diff"
         fi
-        source venv/bin/activate &&
         ansible-playbook -i ansible/inventory \
         ansible/dev-pulp-container-tag-query-kayobe.yml \
         ansible/dev-pulp-container-promote.yml \

From e6dd548ba9b392b7ea90691dafb9e363e4d7a6aa Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 29 Jan 2024 15:08:40 +0000
Subject: [PATCH 9/9] Make kayobe config branch input required in container
 promote workflow

---
 .github/workflows/container-promote.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/container-promote.yml b/.github/workflows/container-promote.yml
index 4ca05874..b5133014 100644
--- a/.github/workflows/container-promote.yml
+++ b/.github/workflows/container-promote.yml
@@ -9,7 +9,7 @@ on:
         required: false
         default: ""
       kayobe_config_branch:
-        required: false
+        required: true
         description: Branch of StackHPC Kayobe configuration to use
       check_mode:
         description: Check mode