1111 description : Build Ubuntu 24.04 Noble
1212 type : boolean
1313 default : true
14+ ubuntu-jammy :
15+ description : Build Ubuntu 22.04 Jammy
16+ type : boolean
17+ default : False
1418 runner_env :
1519 description : Which cloud to run on?
1620 type : choice
@@ -294,7 +298,8 @@ jobs:
294298 kayobe playbook run \
295299 src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
296300 -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
297- -e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
301+ -e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }} \
302+ -e cpu-platform=${{ env.overcloud_dib_architecture }}
298303 env :
299304 CLOUDS_YAML : ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
300305 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
@@ -363,7 +368,8 @@ jobs:
363368 kayobe playbook run \
364369 src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
365370 -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
366- -e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
371+ -e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }} \
372+ -e cpu-platform=${{ env.overcloud_dib_architecture }}
367373 env :
368374 CLOUDS_YAML : ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
369375 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
@@ -402,7 +408,7 @@ jobs:
402408 src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
403409 -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
404410 -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
405- -e artifact_type=" kayobe-images" \
411+ -e artifact_type=kayobe-images/${{ inputs.cpu-platform-architecture }} \
406412 -e file_regex="*.qcow2" \
407413 -e os_distribution="ubuntu" \
408414 -e os_release="noble"
@@ -417,7 +423,8 @@ jobs:
417423 kayobe playbook run \
418424 src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
419425 -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
420- -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
426+ -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }} \
427+ -e cpu-platform=${{ env.overcloud_dib_architecture }}
421428 env :
422429 CLOUDS_YAML : ${{ secrets.CLOUDS_YAML }}
423430 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
@@ -431,7 +438,8 @@ jobs:
431438 kayobe playbook run \
432439 src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
433440 -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
434- -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
441+ -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }} \
442+ -e cpu-platform=${{ env.overcloud_dib_architecture }}
435443 env :
436444 CLOUDS_YAML : ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
437445 OS_APPLICATION_CREDENTIAL_ID : ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
0 commit comments