Bump stackhpc-openstack-gh-workflows to 1.5.0

.github/workflows/multinode-inputs.py

@@ -17,6 +17,7 @@ class OSRelease:
 @dataclass
 class OpenStackRelease:
     version: str
+    previous_version: str
     os_releases: t.List[OSRelease]
 
 
@@ -33,17 +34,27 @@ class Scenario:
 UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
 # NOTE(upgrade): Add supported releases here.
 OPENSTACK_RELEASES = [
-    OpenStackRelease("2023.1", [ROCKY_9, UBUNTU_JAMMY]),
-    OpenStackRelease("2024.1", [ROCKY_9, UBUNTU_JAMMY]),
-    OpenStackRelease("2025.1", [ROCKY_9, UBUNTU_NOBLE]),
+    OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
+    OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
+    OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
 ]
 NEUTRON_PLUGINS = ["ovs", "ovn"]
 VERSION_HIERARCHY = ["zed", "2023.1", "2024.1", "2025.1"]
 
 
 def main() -> None:
     scenario = random_scenario()
-    inputs = generate_inputs(scenario)
+    inputs = {
+        "os_distribution": scenario.os_release.distribution,
+        "os_release": scenario.os_release.release,
+        "ssh_username": scenario.os_release.ssh_username,
+        "neutron_plugin": scenario.neutron_plugin,
+        "upgrade": scenario.upgrade,
+        "stackhpc_kayobe_config_version": get_branch(scenario.openstack_release.version),
+        "stackhpc_kayobe_config_previous_version": get_branch(scenario.openstack_release.previous_version),
+        "terraform_kayobe_multinode_version": get_tkm_version(scenario.openstack_release.version),
+        "terraform_kayobe_multinode_previous_version": get_tkm_version(scenario.openstack_release.previous_version),
+    }
     for name, value in inputs.items():
         write_output(name, value)
 
@@ -56,36 +67,15 @@ def random_scenario() -> Scenario:
     return Scenario(openstack_release, os_release, neutron_plugin, upgrade)
 
 
-def generate_inputs(scenario: Scenario) -> t.Dict[str, str]:
-    branch = get_branch(scenario.openstack_release.version)
-    previous_branch = get_branch(
-        VERSION_HIERARCHY[
-            VERSION_HIERARCHY.index(scenario.openstack_release.version) - 1
-        ]
-    )
-    terraform_kayobe_multinode_version = get_tkm_version(
-        scenario.openstack_release.version
-    )
-    inputs = {
-        "os_distribution": scenario.os_release.distribution,
-        "os_release": scenario.os_release.release,
-        "ssh_username": scenario.os_release.ssh_username,
-        "neutron_plugin": scenario.neutron_plugin,
-        "upgrade": scenario.upgrade,
-        "stackhpc_kayobe_config_version": branch,
-        "stackhpc_kayobe_config_previous_version": previous_branch,
-        "terraform_kayobe_multinode_version": terraform_kayobe_multinode_version,
-    }
-    return inputs
-
-
 def get_branch(version: str) -> str:
     return f"stackhpc/{version}"
 
 
 def get_tkm_version(version: str) -> str:
-    if version in ["zed", "2023.1"]:
+    if version == "zed":
         return "ea61ea1730e179e05e8f0e58b759267664c555e7"
+    elif version in ["2023.1", "2024.1"]:
+        return "stackhpc/2024.1" # This version is targeted to support Caracal or older releases
     else:
         return "main"
 

.github/workflows/stackhpc-multinode-periodic.yml

@@ -20,6 +20,7 @@ jobs:
       stackhpc_kayobe_config_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_version }}
       stackhpc_kayobe_config_previous_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
       terraform_kayobe_multinode_version: ${{ steps.generate-inputs.outputs.terraform_kayobe_multinode_version }}
+      terraform_kayobe_multinode_previous_version: ${{ steps.generate-inputs.outputs.terraform_kayobe_multinode_previous_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -36,7 +37,7 @@ jobs:
     name: Multinode periodic
     needs:
       - generate-inputs
-    uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.4.0
+    uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.5.0
     with:
       multinode_name: mn-periodic-${{ github.run_id }}
       os_distribution: ${{ needs.generate-inputs.outputs.os_distribution }}
@@ -47,6 +48,7 @@ jobs:
       stackhpc_kayobe_config_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_version }}
       stackhpc_kayobe_config_previous_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
       terraform_kayobe_multinode_version: ${{ needs.generate-inputs.outputs.terraform_kayobe_multinode_version }}
+      terraform_kayobe_multinode_previous_version: ${{ needs.generate-inputs.outputs.terraform_kayobe_multinode_previous_version }}
       enable_slack_alert: true
     secrets: inherit
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'

.github/workflows/stackhpc-multinode.yml

@@ -56,7 +56,7 @@ name: Multinode
 jobs:
   multinode:
     name: Multinode
-    uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.4.1
+    uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.5.0
     with:
       multinode_name: ${{ inputs.multinode_name }}
       os_distribution: ${{ inputs.os_distribution }}
@@ -72,4 +72,5 @@ jobs:
       # NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
       stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
       terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
+      terraform_kayobe_multinode_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'main' }}
     secrets: inherit