DNM - test pulp collections bump

Author: Alex-Welsh

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

@@ -253,7 +253,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/pulp-artifact-upload.yml \
+          src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml -vvvvv \
           -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
           -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
           -e artifact_type="kayobe-images" \
@@ -321,7 +321,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/pulp-artifact-upload.yml \
+          src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml -vvvvv \
           -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
           -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
           -e artifact_type="kayobe-images" \

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

@@ -26,20 +26,11 @@
           - ndg-httpsclient
           - pyasn1
           - urllib3
+          - packaging
+          - pulp-glue<0.34.0,>=0.33.0
+          - pulp-glue-deb<0.4.0,>=0.3.0
         state: present
 
-    - name: Upload an artifact
-      pulp.squeezer.artifact:
-        pulp_url: "{{ remote_pulp_url }}"
-        username: "{{ remote_pulp_username }}"
-        password: "{{ remote_pulp_password }}"
-        file: "{{ found_files.files[0].path }}"
-        state: present
-      register: upload_result
-      until: upload_result is success
-      retries: 3
-      delay: 60
-
     - name: Get sha256 hash
       ansible.builtin.stat:
         path: "{{ found_files.files[0].path }}"
@@ -58,87 +49,49 @@
         checksum_algorithm: sha256
       register: checksum_stats
 
-    - name: Upload checksum artifact
-      pulp.squeezer.artifact:
+    - name: Ensure file repo exists
+      pulp.squeezer.file_repository:
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
-        file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
+        name: "{{ repository_name }}"
         state: present
-      register: checksum_upload_result
-      until: checksum_upload_result is success
+      register: file_repo_result
+      until: file_repo_result is success
       retries: 3
-      delay: 60
-      when: upload_checksum
+      delay: 5
 
-    - name: Create file content from artifact
+    - name: Upload artifact
       pulp.squeezer.file_content:
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
+        file: "{{ found_files.files[0].path }}"
         sha256: "{{ file_stats.stat.checksum }}"
         relative_path: "{{ found_files.files[0].path | basename }}"
         state: present
+        repository: "{{ repository_name }}"
       register: file_content_result
       until: file_content_result is success
       retries: 3
       delay: 5
 
-    - name: Create checksum content from artifact
+    - name: Upload checksum
       pulp.squeezer.file_content:
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
+        file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
         sha256: "{{ checksum_stats.stat.checksum }}"
         relative_path: "{{ found_files.files[0].path | basename }}.sha256"
         state: present
+        repository: "{{ repository_name }}"
       register: checksum_content_result
       until: checksum_content_result is success
       retries: 3
       delay: 5
       when: upload_checksum
 
-    - name: Ensure file repo exists
-      pulp.squeezer.file_repository:
-        pulp_url: "{{ remote_pulp_url }}"
-        username: "{{ remote_pulp_username }}"
-        password: "{{ remote_pulp_password }}"
-        name: "{{ repository_name }}"
-        state: present
-      register: file_repo_result
-      until: file_repo_result is success
-      retries: 3
-      delay: 5
-
-    - name: Add content to file repo
-      pulp.squeezer.file_repository_content:
-        pulp_url: "{{ remote_pulp_url }}"
-        username: "{{ remote_pulp_username }}"
-        password: "{{ remote_pulp_password }}"
-        repository: "{{ repository_name }}"
-        present_content:
-          - relative_path: "{{ found_files.files[0].path | basename }}"
-            sha256: "{{ file_stats.stat.checksum }}"
-      register: file_repo_content_result
-      until: file_repo_content_result is success
-      retries: 3
-      delay: 5
-
-    - name: Add checksum content to file repo
-      pulp.squeezer.file_repository_content:
-        pulp_url: "{{ remote_pulp_url }}"
-        username: "{{ remote_pulp_username }}"
-        password: "{{ remote_pulp_password }}"
-        repository: "{{ repository_name }}"
-        present_content:
-          - relative_path: "{{ found_files.files[0].path | basename }}.sha256"
-            sha256: "{{ checksum_stats.stat.checksum }}"
-      register: checksum_repo_content_result
-      until: checksum_repo_content_result is success
-      retries: 3
-      delay: 5
-      when: upload_checksum
-
     - name: Create a new publication to point to this version
       pulp.squeezer.file_publication:
         pulp_url: "{{ remote_pulp_url }}"

etc/kayobe/ansible/requirements.yml

@@ -2,12 +2,12 @@
 collections:
   - name: stackhpc.cephadm
     version: 1.22.0
-  # NOTE: Pinning pulp.squeezer to 0.0.13 because 0.0.14+ depends on the
-  # pulp_glue Python library being installed.
   - name: pulp.squeezer
-    version: 0.0.13
+    version: 0.2.3
   - name: stackhpc.pulp
-    version: 0.5.5
+    version: full-parallel
+    type: git
+    source: https://github.com/stackhpc/ansible-collection-pulp
   - name: stackhpc.hashicorp
     version: 2.7.1
   - name: stackhpc.kayobe_workflows

etc/kayobe/kolla-image-tags.yml

@@ -2,6 +2,7 @@
 # Dict of Kolla image tags to deploy for each service.
 # Each key is the tag variable prefix name, and the value is another dict,
 # where the key is the OS distro and the value is the tag to deploy.
+# Foo test ci
 kolla_image_tags:
   openstack:
     rocky-9: 2025.1-rocky-9-20250730T105631

requirements.txt

@@ -1,4 +1,5 @@
 kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/18.3.0.6
 ansible-modules-hashivault>=5.3.0
-pulp-glue<0.32,>=0.29.2
+pulp-glue==0.33.*
+pulp-glue-deb==0.3.*
 jmespath