Skip to content

Commit 35eff5b

Browse files
committed
Bump stackhpc-openstack-gh-workflows to 1.5.0
To make upgrading tests to work with new versioned terraform-kayobe-multinode branches. New workflow variable ``terraform_kayobe_multinode_previous_version`` was introduced. multinode-inputs.py and workflow files were updated accordingly.
1 parent 9fb46fb commit 35eff5b

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/workflows/multinode-inputs.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ def generate_inputs(scenario: Scenario) -> t.Dict[str, str]:
6666
terraform_kayobe_multinode_version = get_tkm_version(
6767
scenario.openstack_release.version
6868
)
69+
terraform_kayobe_multinode_previous_version = get_tkm_version(
70+
VERSION_HIERARCHY[
71+
VERSION_HIERARCHY.index(scenario.openstack_release.version) - 1
72+
]
73+
)
6974
inputs = {
7075
"os_distribution": scenario.os_release.distribution,
7176
"os_release": scenario.os_release.release,
@@ -75,6 +80,7 @@ def generate_inputs(scenario: Scenario) -> t.Dict[str, str]:
7580
"stackhpc_kayobe_config_version": branch,
7681
"stackhpc_kayobe_config_previous_version": previous_branch,
7782
"terraform_kayobe_multinode_version": terraform_kayobe_multinode_version,
83+
"terraform_kayobe_multinode_previous_version": terraform_kayobe_multinode_previous_version,
7884
}
7985
return inputs
8086

@@ -84,8 +90,10 @@ def get_branch(version: str) -> str:
8490

8591

8692
def get_tkm_version(version: str) -> str:
87-
if version in ["zed", "2023.1"]:
93+
if version == "zed":
8894
return "ea61ea1730e179e05e8f0e58b759267664c555e7"
95+
elif version in ["2023.1", "2024.1"]:
96+
return "stackhpc/2024.1" # This version is targeted to support Caracal or older releases
8997
else:
9098
return "main"
9199

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
stackhpc_kayobe_config_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_version }}
2121
stackhpc_kayobe_config_previous_version: ${{ steps.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
2222
terraform_kayobe_multinode_version: ${{ steps.generate-inputs.outputs.terraform_kayobe_multinode_version }}
23+
terraform_kayobe_multinode_previous_version: ${{ steps.generate-inputs.outputs.terraform_kayobe_multinode_previous_version }}
2324
steps:
2425
- name: Checkout
2526
uses: actions/checkout@v4
@@ -36,7 +37,7 @@ jobs:
3637
name: Multinode periodic
3738
needs:
3839
- generate-inputs
39-
uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.4.0
40+
uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.5.0
4041
with:
4142
multinode_name: mn-periodic-${{ github.run_id }}
4243
os_distribution: ${{ needs.generate-inputs.outputs.os_distribution }}
@@ -47,6 +48,7 @@ jobs:
4748
stackhpc_kayobe_config_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_version }}
4849
stackhpc_kayobe_config_previous_version: ${{ needs.generate-inputs.outputs.stackhpc_kayobe_config_previous_version }}
4950
terraform_kayobe_multinode_version: ${{ needs.generate-inputs.outputs.terraform_kayobe_multinode_version }}
51+
terraform_kayobe_multinode_previous_version: ${{ needs.generate-inputs.outputs.terraform_kayobe_multinode_previous_version }}
5052
enable_slack_alert: true
5153
secrets: inherit
5254
if: github.repository == 'stackhpc/stackhpc-kayobe-config'

.github/workflows/stackhpc-multinode.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ name: Multinode
5656
jobs:
5757
multinode:
5858
name: Multinode
59-
uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.4.1
59+
uses: stackhpc/stackhpc-openstack-gh-workflows/.github/workflows/multinode.yml@1.5.0
6060
with:
6161
multinode_name: ${{ inputs.multinode_name }}
6262
os_distribution: ${{ inputs.os_distribution }}
@@ -72,4 +72,5 @@ jobs:
7272
# NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
7373
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
7474
terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
75+
terraform_kayobe_multinode_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'main' }}
7576
secrets: inherit

0 commit comments

Comments
 (0)