Generalise promotion workflow

Author: assumptionsandg

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

@@ -242,7 +242,7 @@ jobs:
           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 artifact_type="kayobe-images" \
           -e file_regex="*.qcow2" \
           -e os_distribution="rocky" \
           -e os_release="9"
@@ -296,7 +296,7 @@ jobs:
           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 artifact_type="kayobe-images" \
           -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"

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

@@ -76,12 +76,12 @@ 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-promote.yml \
-          -e image_path='/opt/kayobe/images/overcloud-rocky-linux-9' \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
           -e os_distribution='rocky' \
           -e os_release='9'
         env:
-          OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
+          ARTIFACT_TAG: ${{ inputs.image_tag }}
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.rocky9
 
@@ -90,11 +90,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-host-image-promote.yml \
-          -e image_path='/opt/kayobe/images/overcloud-ubuntu-jammy' \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
           -e os_distribution='ubuntu' \
           -e os_release='jammy'
         env:
-          OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
+          ARTIFACT_TAG: ${{ inputs.image_tag }}
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.ubuntu-jammy

etc/kayobe/ansible/pulp-host-image-promote.yml renamed to etc/kayobe/ansible/pulp-artifact-promote.yml

@@ -1,17 +1,16 @@
 ---
-# Tag is the version of the image to promote, stored in an env variable named OVERCLOUD_HOST_IMAGE_TAG
-- name: Promote an image to production
+# Tag is the version of the artifact to promote, stored in an env variable named ARTIFACT_TAG
+- name: Promote an artifact to production
   hosts: localhost
   vars:
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
     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') }}"
+    repository_name: "{{ artifact_type }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_type }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
+    promotion_tag: "{{ lookup('env', 'ARTIFACT_TAG') }}"
   tasks:
-
-    - name: Check whether the image exists
+    - name: Check whether the artifact exists
       pulp.squeezer.file_distribution:
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
@@ -23,9 +22,9 @@
       retries: 3
       delay: 5
 
-    - name: Fail if the image does not exist
+    - name: Fail if the artifact does not exist
       fail:
-        msg: "Image {{ promotion_tag }} does not exist"
+        msg: "artifact {{ promotion_tag }} does not exist"
       when: distribution_details.distribution is none
 
     - name: Ensure production content guard is set

etc/kayobe/ansible/pulp-artifact-upload.yml

@@ -5,8 +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_name }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
-    pulp_base_path: "{{ artifact_name }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
+    repository_name: "{{ artifact_type }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_type }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
   tasks:
     - name: Print artifact tag
       debug: