Build previous release too

Author: MoteHue

.github/workflows/stackhpc-all-in-one.yml

@@ -11,6 +11,10 @@ on:
         description: Kayobe container image
         type: string
         required: true
+      previous_kayobe_image:
+        description: Previous Kayobe container image
+        type: string
+        required: true
       os_distribution:
         description: Host OS distribution
         type: string
@@ -81,7 +85,7 @@ jobs:
       KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
       KAYOBE_IMAGE: ${{ inputs.kayobe_image }}
       # NOTE(upgrade): Reference the PREVIOUS release here.
-      PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2023.1
+      PREVIOUS_KAYOBE_IMAGE: ${{ inputs.previous_kayobe_image }}
       # NOTE(upgrade): Reference the PREVIOUS release branch here.
       PREVIOUS_BRANCH: rabbitmq-multiple-versions
     steps:

.github/workflows/stackhpc-build-kayobe-image.yml

@@ -25,6 +25,9 @@ on:
         type: string
         required: false
         default: "rockylinux:9"
+      kayobe_config_branch:
+        type: string
+        required: false
       if:
         description: Whether to run the workflow (workaround for required status checks issue)
         type: boolean
@@ -53,6 +56,7 @@ jobs:
       - name: Checkout kayobe config
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.kayobe_config_branch || github.ref }}
           submodules: true
 
       - name: Log in to the Container registry
@@ -96,5 +100,5 @@ jobs:
              KAYOBE_USER_UID=1001
              KAYOBE_USER_GID=1001
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}${{ inputs.kayobe_config_branch }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/stackhpc-pull-request.yml

@@ -77,6 +77,16 @@ jobs:
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
 
+  build-kayobe-image-previous:
+    name: Build Kayobe Image for previous release
+    needs:
+      - check-changes
+    uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
+    with:
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
+      kayobe_config_branch: rabbitmq-multiple-versions # Note: this would be stackhpc/2023.1 in a proper setup
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+
   check-tags:
     name: Check container image tags
     needs:
@@ -89,52 +99,30 @@ jobs:
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
-
-  all-in-one-upgrade-ubuntu-jammy-ovs:
-    name: aio upgrade (Ubuntu Jammy OVS)
+  check-tags-previous:
+    name: Check container image tags
     needs:
       - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
+      - build-kayobe-image-previous
+    uses: ./.github/workflows/stackhpc-check-tags.yml
     with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: ubuntu
-      os_release: jammy
-      ssh_username: ubuntu
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-      upgrade: true
+      kayobe_image: ${{ needs.build-kayobe-image-previous.outputs.kayobe_image }}
+      if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  all-in-one-upgrade-rocky-9-ovn:
-    name: aio upgrade (Rocky 9 OVN)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovn
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-      upgrade: true
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
 
   all-in-one-upgrade-ubuntu-jammy-ovn:
-    name: aio upgrade (Ubuntu Jammy OVS)
+    name: aio upgrade (Ubuntu Jammy OVN)
     needs:
       - check-changes
       - build-kayobe-image
+      - build-kayobe-image-previous
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
       kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+      previous_kayobe_image: ${{ needs.build-kayobe-image-previous.outputs.kayobe_image }}
       os_distribution: ubuntu
       os_release: jammy
       ssh_username: ubuntu
@@ -144,21 +132,3 @@ jobs:
       upgrade: true
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-upgrade-rocky-9-ovs:
-    name: aio upgrade (Rocky 9 OVN)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-      upgrade: true
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}