Skip to content

Commit 3198fce

Browse files
Revert changes to overcloud image build
1 parent d472c33 commit 3198fce

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
6767
# Generate a tag to apply to all built overcloud host images.
6868
- name: Generate overcloud host image tag
69-
id: image_tag
69+
id: host_image_tag
7070
run: |
71-
echo "image_tag=$(date +${{ steps.openstack_release.outputs.openstack_release }}-%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
71+
echo "host_image_tag=$(date +${{ steps.openstack_release.outputs.openstack_release }}-%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
7272
7373
- name: Display overcloud host image tag
7474
run: |
75-
echo "${{ steps.image_tag.outputs.image_tag }}"
75+
echo "${{ steps.host_image_tag.outputs.host_image_tag }}"
7676
7777
- name: Install Kayobe
7878
run: |
@@ -241,7 +241,7 @@ jobs:
241241
kayobe playbook run \
242242
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
243243
-e image_path=/opt/kayobe/images/overcloud-rocky-9 \
244-
-e image_tag=${{ steps.image_tag.outputs.image_tag }} \
244+
-e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
245245
-e os_distribution="rocky" \
246246
-e os_release="9"
247247
env:
@@ -255,7 +255,7 @@ jobs:
255255
kayobe playbook run \
256256
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
257257
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
258-
-e image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }}
258+
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
259259
env:
260260
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
261261
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
@@ -293,7 +293,7 @@ jobs:
293293
kayobe playbook run \
294294
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
295295
-e image_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
296-
-e image_tag=${{ steps.image_tag.outputs.image_tag }} \
296+
-e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
297297
-e os_distribution="ubuntu" \
298298
-e os_release="jammy"
299299
env:
@@ -307,7 +307,7 @@ jobs:
307307
kayobe playbook run \
308308
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
309309
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
310-
-e image_name=overcloud-ubuntu-jammy-${{ steps.image_tag.outputs.image_tag }}
310+
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
311311
env:
312312
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
313313
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}

0 commit comments

Comments
 (0)