From 09e1d2f3635dc84e81b9e08b73e33351c6de75e1 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Wed, 4 Dec 2024 11:55:24 +0000
Subject: [PATCH] Fix artifact references in host-image-build

---
 .../workflows/overcloud-host-image-build.yml   | 18 ++++++++++--------
 ...age-upload.yml => pulp-artifact-upload.yml} |  7 +++----
 2 files changed, 13 insertions(+), 12 deletions(-)
 rename etc/kayobe/ansible/{pulp-image-upload.yml => pulp-artifact-upload.yml} (96%)

diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
index cb365d214..942d76fd0 100644
--- a/.github/workflows/overcloud-host-image-build.yml
+++ b/.github/workflows/overcloud-host-image-build.yml
@@ -239,10 +239,11 @@ 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-image-upload.yml \
-          -e image_path=/opt/kayobe/images/overcloud-rocky-9 \
-          -e image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -e image_name="kayobe-images" \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
+          -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
+          -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e artifact_name="kayobe-images" \
+          -e file_regex="*.qcow2" \
           -e os_distribution="rocky" \
           -e os_release="9"
         env:
@@ -292,10 +293,11 @@ 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-image-upload.yml \
-          -e image_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
-          -e image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -e image_name="kayobe-images" \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
+          -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
+          -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e artifact_name="kayobe-images" \
+          -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
         env:
diff --git a/etc/kayobe/ansible/pulp-image-upload.yml b/etc/kayobe/ansible/pulp-artifact-upload.yml
similarity index 96%
rename from etc/kayobe/ansible/pulp-image-upload.yml
rename to etc/kayobe/ansible/pulp-artifact-upload.yml
index 19be5f584..0d696e294 100644
--- a/etc/kayobe/ansible/pulp-image-upload.yml
+++ b/etc/kayobe/ansible/pulp-artifact-upload.yml
@@ -5,9 +5,8 @@
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
     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'
+    repository_name: "{{ artifact_name }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_name }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
   tasks:
     - name: Print artifact tag
       debug:
@@ -16,7 +15,7 @@
     - name: Get filename
       find:
         paths: "{{ artifact_path }}"
-        patterns: "*.{{ file_extension }}"
+        patterns: "{{ file_regex }}"
       register: found_files
 
     - name: Upload an artifact