Skip to content

Commit 472340c

Browse files
committed
overcloud host image: upload to local cloud before Ark
this saves time when one wants to use the image on the local cloud, delaying the ark upload by less than a minute
1 parent 8207567 commit 472340c

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -248,22 +248,6 @@ jobs:
248248
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
249249
if: steps.build_rocky_9.outcome == 'failure'
250250

251-
- name: Upload Rocky Linux 9 overcloud host image to Ark
252-
run: |
253-
source venvs/kayobe/bin/activate &&
254-
source src/kayobe-config/kayobe-env --environment ci-builder &&
255-
kayobe playbook run \
256-
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
257-
-e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
258-
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
259-
-e artifact_type="kayobe-images" \
260-
-e file_regex="*.qcow2" \
261-
-e os_distribution="rocky" \
262-
-e os_release="9"
263-
env:
264-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
265-
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
266-
267251
- name: Upload Rocky Linux 9 overcloud host image to current Dev Cloud (SMS/Leafcloud)
268252
run: |
269253
source venvs/kayobe/bin/activate &&
@@ -292,6 +276,22 @@ jobs:
292276
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
293277
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
294278

279+
- name: Upload Rocky Linux 9 overcloud host image to Ark
280+
run: |
281+
source venvs/kayobe/bin/activate &&
282+
source src/kayobe-config/kayobe-env --environment ci-builder &&
283+
kayobe playbook run \
284+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
285+
-e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
286+
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
287+
-e artifact_type="kayobe-images" \
288+
-e file_regex="*.qcow2" \
289+
-e os_distribution="rocky" \
290+
-e os_release="9"
291+
env:
292+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
293+
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
294+
295295
- name: Build an Ubuntu Noble 24.04 overcloud host image
296296
id: build_ubuntu_noble
297297
continue-on-error: true
@@ -316,22 +316,6 @@ jobs:
316316
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
317317
if: steps.build_ubuntu_noble.outcome == 'failure'
318318

319-
- name: Upload Ubuntu Noble 24.04 overcloud host image to Ark
320-
run: |
321-
source venvs/kayobe/bin/activate &&
322-
source src/kayobe-config/kayobe-env --environment ci-builder &&
323-
kayobe playbook run \
324-
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
325-
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
326-
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
327-
-e artifact_type="kayobe-images" \
328-
-e file_regex="*.qcow2" \
329-
-e os_distribution="ubuntu" \
330-
-e os_release="noble"
331-
env:
332-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
333-
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
334-
335319
- name: Upload Ubuntu Noble overcloud host image to current Dev Cloud (SMS/Leafcloud)
336320
run: |
337321
source venvs/kayobe/bin/activate &&
@@ -360,6 +344,22 @@ jobs:
360344
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
361345
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
362346

347+
- name: Upload Ubuntu Noble 24.04 overcloud host image to Ark
348+
run: |
349+
source venvs/kayobe/bin/activate &&
350+
source src/kayobe-config/kayobe-env --environment ci-builder &&
351+
kayobe playbook run \
352+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
353+
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
354+
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
355+
-e artifact_type="kayobe-images" \
356+
-e file_regex="*.qcow2" \
357+
-e os_distribution="ubuntu" \
358+
-e os_release="noble"
359+
env:
360+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
361+
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
362+
363363
- name: Copy logs back
364364
continue-on-error: true
365365
run: |

0 commit comments

Comments
 (0)