Skip to content

Generalise host image playbooks #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 4, 2024
Merged

Generalise host image playbooks #1390

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
598f4de
Generalise image upload playbook
assumptionsandg Nov 29, 2024
9f5d934
Replace occurences to host-image
assumptionsandg Nov 29, 2024
d472c33
Variable for file extension
assumptionsandg Nov 29, 2024
3198fce
Revert changes to overcloud image build
assumptionsandg Nov 29, 2024
a34f927
Update file extension variable
assumptionsandg Dec 3, 2024
b993c1a
Use image name
assumptionsandg Dec 3, 2024
24f08f0
s/image/artifact/g
assumptionsandg Dec 3, 2024
0f22356
Remove image_repository creds
assumptionsandg Dec 3, 2024
09e1d2f
Fix artifact references in host-image-build
assumptionsandg Dec 4, 2024
664241a
Generalise promotion workflow
assumptionsandg Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/overcloud-host-image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe playbook run \
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-upload.yml \
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
-e image_path=/opt/kayobe/images/overcloud-rocky-9 \
-e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-e os_distribution="rocky" \
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe playbook run \
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-upload.yml \
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
-e image_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
-e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-e os_distribution="ubuntu" \
Expand Down
15 changes: 8 additions & 7 deletions ...kayobe/ansible/pulp-host-image-upload.yml → etc/kayobe/ansible/pulp-image-upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
remote_pulp_password: "{{ stackhpc_image_repository_password }}"
repository_name: "kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
pulp_base_path: "kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
file_extension: '*.qcow2'
tasks:
- name: Print image tag
debug:
msg: "Image tag: {{ host_image_tag }}"
msg: "Image tag: {{ image_tag }}"

- name: Get filename
find:
paths: "{{ image_path }}"
patterns: '*.qcow2'
patterns: "{{ file_extension }}"
register: found_files

- name: Upload an artifact
Expand Down Expand Up @@ -107,8 +108,8 @@
pulp_url: "{{ remote_pulp_url }}"
username: "{{ remote_pulp_username }}"
password: "{{ remote_pulp_password }}"
name: "{{ repository_name }}_{{ host_image_tag }}"
base_path: "{{ pulp_base_path }}/{{ host_image_tag }}"
name: "{{ repository_name }}_{{ image_tag }}"
base_path: "{{ pulp_base_path }}/{{ image_tag }}"
publication: "{{ publication_details.publication.pulp_href }}"
content_guard: development
state: present
Expand All @@ -122,7 +123,7 @@
lineinfile:
path: /tmp/updated_images.txt
line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/\
{{ host_image_tag }}/{{ found_files.files[0].path | basename }}"
{{ image_tag }}/{{ found_files.files[0].path | basename }}"
create: true

- name: Update new images file with latest path
Expand All @@ -135,7 +136,7 @@
- name: Print versioned path
debug:
msg: "New versioned path: {{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/\
{{ host_image_tag }}/{{ found_files.files[0].path | basename }}"
{{ image_tag }}/{{ found_files.files[0].path | basename }}"
when: latest_distribution_details.changed

- name: Print latest path
Expand All @@ -146,5 +147,5 @@

- name: Print version tag
debug:
msg: "New tag: {{ host_image_tag }}"
msg: "New tag: {{ image_tag }}"
when: latest_distribution_details.changed