Skip to content

Commit d737db2

Browse files
MoteHueMoteHue
committed
DNM: test
1 parent 0d9052b commit d737db2

File tree

2 files changed

+148
-148
lines changed

2 files changed

+148
-148
lines changed

‎.github/workflows/amphora-image-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
branch: bump-overcloud-host-images-${{ inputs.rocky9_tag }}-${{ inputs.ubuntu_noble_tag }}
4848
delete-branch: true
4949
title: >-
50-
Bump overcloud host image tags
50+
DNM: test PR: Bump overcloud host image tags
5151
body: |
5252
This PR was created automatically to update the overcloud host image
5353
tags.

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

Lines changed: 147 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -230,163 +230,163 @@ jobs:
230230
env:
231231
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
232232

233-
- name: Build a Rocky Linux 9 overcloud host image
234-
id: build_rocky_9
235-
continue-on-error: true
236-
run: |
237-
source venvs/kayobe/bin/activate &&
238-
source src/kayobe-config/kayobe-env --environment ci-builder &&
239-
kayobe overcloud host image build --force-rebuild \
240-
-e os_distribution="rocky" \
241-
-e os_release="9" \
242-
-e stackhpc_overcloud_dib_name=overcloud-rocky-9
243-
env:
244-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
245-
if: inputs.rocky9
246-
247-
- name: Show last error logs
248-
continue-on-error: true
249-
run: |
250-
source venvs/kayobe/bin/activate &&
251-
source src/kayobe-config/kayobe-env --environment ci-builder &&
252-
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.stdout" --show-output
253-
env:
254-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
255-
if: steps.build_rocky_9.outcome == 'failure'
233+
# - name: Build a Rocky Linux 9 overcloud host image
234+
# id: build_rocky_9
235+
# continue-on-error: true
236+
# run: |
237+
# source venvs/kayobe/bin/activate &&
238+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
239+
# kayobe overcloud host image build --force-rebuild \
240+
# -e os_distribution="rocky" \
241+
# -e os_release="9" \
242+
# -e stackhpc_overcloud_dib_name=overcloud-rocky-9
243+
# env:
244+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
245+
# if: inputs.rocky9
256246

257-
- name: Upload Rocky Linux 9 overcloud host image to Ark
258-
run: |
259-
source venvs/kayobe/bin/activate &&
260-
source src/kayobe-config/kayobe-env --environment ci-builder &&
261-
kayobe playbook run \
262-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
263-
-e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
264-
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
265-
-e artifact_type="kayobe-images" \
266-
-e file_regex="*.qcow2" \
267-
-e os_distribution="rocky" \
268-
-e os_release="9"
269-
env:
270-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
271-
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
247+
# - name: Show last error logs
248+
# continue-on-error: true
249+
# run: |
250+
# source venvs/kayobe/bin/activate &&
251+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
252+
# kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.stdout" --show-output
253+
# env:
254+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
255+
# if: steps.build_rocky_9.outcome == 'failure'
272256

273-
- name: Upload Rocky Linux 9 overcloud host image to current Dev Cloud (SMS/Leafcloud)
274-
run: |
275-
source venvs/kayobe/bin/activate &&
276-
source src/kayobe-config/kayobe-env --environment ci-builder &&
277-
kayobe playbook run \
278-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
279-
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
280-
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
281-
env:
282-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
283-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
284-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
285-
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
257+
# - name: Upload Rocky Linux 9 overcloud host image to Ark
258+
# run: |
259+
# source venvs/kayobe/bin/activate &&
260+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
261+
# kayobe playbook run \
262+
# src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
263+
# -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
264+
# -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
265+
# -e artifact_type="kayobe-images" \
266+
# -e file_regex="*.qcow2" \
267+
# -e os_distribution="rocky" \
268+
# -e os_release="9"
269+
# env:
270+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
271+
# if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
286272

287-
- name: Upload Rocky Linux 9 overcloud host image to other Dev Cloud (Leafcloud/SMS)
288-
run: |
289-
source venvs/kayobe/bin/activate &&
290-
source src/kayobe-config/kayobe-env --environment ci-builder &&
291-
kayobe playbook run \
292-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
293-
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
294-
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
295-
env:
296-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
297-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
298-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
299-
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
300-
301-
- name: Build an Ubuntu Noble 24.04 overcloud host image
302-
id: build_ubuntu_noble
303-
continue-on-error: true
304-
run: |
305-
source venvs/kayobe/bin/activate &&
306-
source src/kayobe-config/kayobe-env --environment ci-builder &&
307-
kayobe overcloud host image build --force-rebuild \
308-
-e os_distribution="ubuntu" \
309-
-e os_release="noble" \
310-
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble
311-
env:
312-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
313-
if: inputs.ubuntu-noble
273+
# - name: Upload Rocky Linux 9 overcloud host image to current Dev Cloud (SMS/Leafcloud)
274+
# run: |
275+
# source venvs/kayobe/bin/activate &&
276+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
277+
# kayobe playbook run \
278+
# src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
279+
# -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
280+
# -e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
281+
# env:
282+
# CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
283+
# OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
284+
# OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
285+
# if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
314286

315-
- name: Show last error logs
316-
continue-on-error: true
317-
run: |
318-
source venvs/kayobe/bin/activate &&
319-
source src/kayobe-config/kayobe-env --environment ci-builder &&
320-
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.stdout" --show-output
321-
env:
322-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
323-
if: steps.build_ubuntu_noble.outcome == 'failure'
287+
# - name: Upload Rocky Linux 9 overcloud host image to other Dev Cloud (Leafcloud/SMS)
288+
# run: |
289+
# source venvs/kayobe/bin/activate &&
290+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
291+
# kayobe playbook run \
292+
# src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
293+
# -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
294+
# -e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
295+
# env:
296+
# CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
297+
# OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
298+
# OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
299+
# if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
300+
301+
# - name: Build an Ubuntu Noble 24.04 overcloud host image
302+
# id: build_ubuntu_noble
303+
# continue-on-error: true
304+
# run: |
305+
# source venvs/kayobe/bin/activate &&
306+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
307+
# kayobe overcloud host image build --force-rebuild \
308+
# -e os_distribution="ubuntu" \
309+
# -e os_release="noble" \
310+
# -e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble
311+
# env:
312+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
313+
# if: inputs.ubuntu-noble
324314

325-
- name: Upload Ubuntu Noble 24.04 overcloud host image to Ark
326-
run: |
327-
source venvs/kayobe/bin/activate &&
328-
source src/kayobe-config/kayobe-env --environment ci-builder &&
329-
kayobe playbook run \
330-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
331-
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
332-
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
333-
-e artifact_type="kayobe-images" \
334-
-e file_regex="*.qcow2" \
335-
-e os_distribution="ubuntu" \
336-
-e os_release="noble"
337-
env:
338-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
339-
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
315+
# - name: Show last error logs
316+
# continue-on-error: true
317+
# run: |
318+
# source venvs/kayobe/bin/activate &&
319+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
320+
# kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.stdout" --show-output
321+
# env:
322+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
323+
# if: steps.build_ubuntu_noble.outcome == 'failure'
340324

341-
- name: Upload Ubuntu Noble overcloud host image to current Dev Cloud (SMS/Leafcloud)
342-
run: |
343-
source venvs/kayobe/bin/activate &&
344-
source src/kayobe-config/kayobe-env --environment ci-builder &&
345-
kayobe playbook run \
346-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
347-
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
348-
-e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
349-
env:
350-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
351-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
352-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
353-
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
325+
# - name: Upload Ubuntu Noble 24.04 overcloud host image to Ark
326+
# run: |
327+
# source venvs/kayobe/bin/activate &&
328+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
329+
# kayobe playbook run \
330+
# src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
331+
# -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
332+
# -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
333+
# -e artifact_type="kayobe-images" \
334+
# -e file_regex="*.qcow2" \
335+
# -e os_distribution="ubuntu" \
336+
# -e os_release="noble"
337+
# env:
338+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
339+
# if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
354340

355-
- name: Upload Ubuntu Noble overcloud host image to other Dev Cloud (Leafcloud/SMS)
356-
run: |
357-
source venvs/kayobe/bin/activate &&
358-
source src/kayobe-config/kayobe-env --environment ci-builder &&
359-
kayobe playbook run \
360-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
361-
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
362-
-e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
363-
env:
364-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
365-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
366-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
367-
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
341+
# - name: Upload Ubuntu Noble overcloud host image to current Dev Cloud (SMS/Leafcloud)
342+
# run: |
343+
# source venvs/kayobe/bin/activate &&
344+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
345+
# kayobe playbook run \
346+
# src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
347+
# -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
348+
# -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
349+
# env:
350+
# CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
351+
# OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
352+
# OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
353+
# if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
368354

369-
- name: Copy logs back
370-
continue-on-error: true
371-
run: |
372-
mkdir logs
373-
scp -r ubuntu@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/opt/kayobe/images/*/*.std* ./logs/
374-
scp -r ubuntu@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/tmp/updated_images.txt ./logs/ || true
375-
if: always()
355+
# - name: Upload Ubuntu Noble overcloud host image to other Dev Cloud (Leafcloud/SMS)
356+
# run: |
357+
# source venvs/kayobe/bin/activate &&
358+
# source src/kayobe-config/kayobe-env --environment ci-builder &&
359+
# kayobe playbook run \
360+
# src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
361+
# -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
362+
# -e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
363+
# env:
364+
# CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
365+
# OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
366+
# OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
367+
# if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
376368

377-
- name: Fail if any overcloud host image builds failed
378-
run: |
379-
echo "Builds failed. See workflow artifacts for details." &&
380-
exit 1
381-
if: steps.build_rocky_9.outcome == 'failure' ||
382-
steps.build_ubuntu_noble.outcome == 'failure'
369+
# - name: Copy logs back
370+
# continue-on-error: true
371+
# run: |
372+
# mkdir logs
373+
# scp -r ubuntu@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/opt/kayobe/images/*/*.std* ./logs/
374+
# scp -r ubuntu@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/tmp/updated_images.txt ./logs/ || true
375+
# if: always()
383376

384-
- name: Upload logs artifact
385-
uses: actions/upload-artifact@v4
386-
with:
387-
name: Build logs
388-
path: ./logs
389-
if: always()
377+
# - name: Fail if any overcloud host image builds failed
378+
# run: |
379+
# echo "Builds failed. See workflow artifacts for details." &&
380+
# exit 1
381+
# if: steps.build_rocky_9.outcome == 'failure' ||
382+
# steps.build_ubuntu_noble.outcome == 'failure'
383+
384+
# - name: Upload logs artifact
385+
# uses: actions/upload-artifact@v4
386+
# with:
387+
# name: Build logs
388+
# path: ./logs
389+
# if: always()
390390

391391
- name: Destroy
392392
run: terraform destroy -auto-approve

0 commit comments

Comments
 (0)