Generalise host image playbooks

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

@@ -239,9 +239,10 @@ 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 image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e image_name="kayobe-images" \
           -e os_distribution="rocky" \
           -e os_release="9"
         env:
@@ -291,9 +292,10 @@ 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 image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e image_name="kayobe-images" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
         env:

etc/kayobe/ansible/pulp-host-image-download.yml

@@ -25,8 +25,8 @@
     - name: Download image artifact
       get_url:
         url: "{{ stackhpc_overcloud_host_image_url_no_auth }}"
-        username: "{{ stackhpc_image_repository_username }}"
-        password: "{{ stackhpc_image_repository_password }}"
+        username: "{{ stackhpc_release_pulp_username }}"
+        password: "{{ stackhpc_release_pulp_password }}"
         force_basic_auth: true
         unredirected_headers:
           - "Authorization"

etc/kayobe/ansible/pulp-host-image-promote.yml

@@ -4,8 +4,8 @@
   hosts: localhost
   vars:
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
-    remote_pulp_username: "{{ stackhpc_image_repository_username }}"
-    remote_pulp_password: "{{ stackhpc_image_repository_password }}"
+    remote_pulp_username: "{{ stackhpc_release_pulp_username }}"
+    remote_pulp_password: "{{ stackhpc_release_pulp_password }}"
     repository_name: "kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
     base_path: "kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
     promotion_tag: "{{ lookup('env', 'OVERCLOUD_HOST_IMAGE_TAG') }}"

etc/kayobe/ansible/pulp-host-image-upload.yml → etc/kayobe/ansible/pulp-image-upload.yml

@@ -1,21 +1,22 @@
 ---
-- name: Upload and create a distribution for an image
+- name: Upload and create a distribution for an artifact
   hosts: seed
   vars:
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
-    remote_pulp_username: "{{ stackhpc_image_repository_username }}"
-    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 }}"
+    remote_pulp_username: "{{ stackhpc_release_pulp_username }}"
+    remote_pulp_password: "{{ stackhpc_release_pulp_password }}"
+    repository_name: "{{ artifact_path }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_path }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
+    file_extension: 'qcow2'
   tasks:
-    - name: Print image tag
+    - name: Print artifact tag
       debug:
-        msg: "Image tag: {{ host_image_tag }}"
+        msg: "artifact tag: {{ artifact_tag }}"
 
     - name: Get filename
       find:
-        paths: "{{ image_path }}"
-        patterns: '*.qcow2'
+        paths: "{{ artifact_path }}"
+        patterns: "*.{{ file_extension }}"
       register: found_files
 
     - name: Upload an artifact
@@ -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 }}_{{ artifact_tag }}"
+        base_path: "{{ pulp_base_path }}/{{ artifact_tag }}"
         publication: "{{ publication_details.publication.pulp_href }}"
         content_guard: development
         state: present
@@ -118,24 +119,24 @@
       retries: 3
       delay: 5
 
-    - name: Update new images file with versioned path
+    - name: Update new artifacts file with versioned path
       lineinfile:
-        path: /tmp/updated_images.txt
+        path: /tmp/updated_artifacts.txt
         line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/\
-        {{ host_image_tag }}/{{ found_files.files[0].path | basename }}"
+        {{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
         create: true
 
-    - name: Update new images file with latest path
+    - name: Update new artifacts file with latest path
       lineinfile:
-        path: /tmp/updated_images.txt
+        path: /tmp/updated_artifacts.txt
         line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/\
         latest/{{ found_files.files[0].path | basename }}"
       when: latest_distribution_details.changed
 
     - 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 }}"
+        {{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
       when: latest_distribution_details.changed
 
     - name: Print latest path
@@ -146,5 +147,5 @@
 
     - name: Print version tag
       debug:
-        msg: "New tag: {{ host_image_tag }}"
+        msg: "New tag: {{ artifact_tag }}"
       when: latest_distribution_details.changed

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -94,5 +94,5 @@ stackhpc_docker_registry_password: !vault |
   3664
 
 # Username and password of the overcloud host image repository.
-stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
-stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
+stackhpc_release_pulp_username: "{{ stackhpc_docker_registry_username }}"
+stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"