Skip to content

Commit 4c55902

Browse files
committed
Change Glance image uploaded name and promotion workflow.
1 parent 77fd672 commit 4c55902

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/overcloud-host-image-promote.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,17 @@ on:
1515
description: Tag to promote
1616
type: string
1717
required: true
18+
cpu-platform-architecture:
19+
description: What is the tagged image's architecture
20+
type: choice
21+
required: true
22+
default: x86_64
23+
options:
24+
- x86_64
25+
- aarch64
1826
env:
1927
ANSIBLE_FORCE_COLOR: True
28+
pulp_artifact_type: ${{ inputs.cpu-platform-architecture == 'x86_64' && 'kayobe-images' || 'kayobe-images/aarch64' }}
2029
jobs:
2130
overcloud-host-image-promote:
2231
name: Promote overcloud host image
@@ -77,7 +86,7 @@ jobs:
7786
source src/kayobe-config/kayobe-env --environment ci-builder &&
7887
kayobe playbook run \
7988
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
80-
-e artifact_type="kayobe-images" \
89+
-e artifact_type=${{ env.pulp_artifact_type }} \
8190
-e os_distribution='rocky' \
8291
-e os_release='9'
8392
env:
@@ -91,7 +100,7 @@ jobs:
91100
source src/kayobe-config/kayobe-env --environment ci-builder &&
92101
kayobe playbook run \
93102
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
94-
-e artifact_type="kayobe-images" \
103+
-e artifact_type=${{ env.pulp_artifact_type }} \
95104
-e os_distribution='ubuntu' \
96105
-e os_release='noble'
97106
env:

etc/kayobe/ansible/openstack-host-image-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
hosts: seed
77
vars:
88
local_image_path: /opt/kayobe/images/overcloud-{{ os_distribution }}-{{ os_release }}/overcloud-{{ os_distribution }}-{{ os_release }}.qcow2
9-
image_name: overcloud-{{ os_distribution }}-{{ os_release }}-{{ cpu_platform }}
9+
image_name: overcloud-{{ os_distribution }}-{{ os_release }}{{ '-arm64' if cpu_platform == 'arm64' else '' }}
1010
tasks:
1111
- name: Upload image to Glance
1212
block:

0 commit comments

Comments
 (0)