Skip to content

Commit 6e67ad0

Browse files
committed
DNM - test pulp collections bump
1 parent 40afadd commit 6e67ad0

File tree

4 files changed

+19
-66
lines changed

4 files changed

+19
-66
lines changed

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

Lines changed: 13 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,9 @@
2626
- ndg-httpsclient
2727
- pyasn1
2828
- urllib3
29+
- packaging
2930
state: present
3031

31-
- name: Upload an artifact
32-
pulp.squeezer.artifact:
33-
pulp_url: "{{ remote_pulp_url }}"
34-
username: "{{ remote_pulp_username }}"
35-
password: "{{ remote_pulp_password }}"
36-
file: "{{ found_files.files[0].path }}"
37-
state: present
38-
register: upload_result
39-
until: upload_result is success
40-
retries: 3
41-
delay: 60
42-
4332
- name: Get sha256 hash
4433
ansible.builtin.stat:
4534
path: "{{ found_files.files[0].path }}"
@@ -58,87 +47,49 @@
5847
checksum_algorithm: sha256
5948
register: checksum_stats
6049

61-
- name: Upload checksum artifact
62-
pulp.squeezer.artifact:
50+
- name: Ensure file repo exists
51+
pulp.squeezer.file_repository:
6352
pulp_url: "{{ remote_pulp_url }}"
6453
username: "{{ remote_pulp_username }}"
6554
password: "{{ remote_pulp_password }}"
66-
file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
55+
name: "{{ repository_name }}"
6756
state: present
68-
register: checksum_upload_result
69-
until: checksum_upload_result is success
57+
register: file_repo_result
58+
until: file_repo_result is success
7059
retries: 3
71-
delay: 60
72-
when: upload_checksum
60+
delay: 5
7361

74-
- name: Create file content from artifact
62+
- name: Upload artifact
7563
pulp.squeezer.file_content:
7664
pulp_url: "{{ remote_pulp_url }}"
7765
username: "{{ remote_pulp_username }}"
7866
password: "{{ remote_pulp_password }}"
67+
file: "{{ found_files.files[0].path }}"
7968
sha256: "{{ file_stats.stat.checksum }}"
8069
relative_path: "{{ found_files.files[0].path | basename }}"
8170
state: present
71+
repository: "{{ repository_name }}"
8272
register: file_content_result
8373
until: file_content_result is success
8474
retries: 3
8575
delay: 5
8676

87-
- name: Create checksum content from artifact
77+
- name: Upload checksum
8878
pulp.squeezer.file_content:
8979
pulp_url: "{{ remote_pulp_url }}"
9080
username: "{{ remote_pulp_username }}"
9181
password: "{{ remote_pulp_password }}"
82+
file: "/tmp/{{ found_files.files[0].path | basename }}.sha256"
9283
sha256: "{{ checksum_stats.stat.checksum }}"
9384
relative_path: "{{ found_files.files[0].path | basename }}.sha256"
9485
state: present
86+
repository: "{{ repository_name }}"
9587
register: checksum_content_result
9688
until: checksum_content_result is success
9789
retries: 3
9890
delay: 5
9991
when: upload_checksum
10092

101-
- name: Ensure file repo exists
102-
pulp.squeezer.file_repository:
103-
pulp_url: "{{ remote_pulp_url }}"
104-
username: "{{ remote_pulp_username }}"
105-
password: "{{ remote_pulp_password }}"
106-
name: "{{ repository_name }}"
107-
state: present
108-
register: file_repo_result
109-
until: file_repo_result is success
110-
retries: 3
111-
delay: 5
112-
113-
- name: Add content to file repo
114-
pulp.squeezer.file_repository_content:
115-
pulp_url: "{{ remote_pulp_url }}"
116-
username: "{{ remote_pulp_username }}"
117-
password: "{{ remote_pulp_password }}"
118-
repository: "{{ repository_name }}"
119-
present_content:
120-
- relative_path: "{{ found_files.files[0].path | basename }}"
121-
sha256: "{{ file_stats.stat.checksum }}"
122-
register: file_repo_content_result
123-
until: file_repo_content_result is success
124-
retries: 3
125-
delay: 5
126-
127-
- name: Add checksum content to file repo
128-
pulp.squeezer.file_repository_content:
129-
pulp_url: "{{ remote_pulp_url }}"
130-
username: "{{ remote_pulp_username }}"
131-
password: "{{ remote_pulp_password }}"
132-
repository: "{{ repository_name }}"
133-
present_content:
134-
- relative_path: "{{ found_files.files[0].path | basename }}.sha256"
135-
sha256: "{{ checksum_stats.stat.checksum }}"
136-
register: checksum_repo_content_result
137-
until: checksum_repo_content_result is success
138-
retries: 3
139-
delay: 5
140-
when: upload_checksum
141-
14293
- name: Create a new publication to point to this version
14394
pulp.squeezer.file_publication:
14495
pulp_url: "{{ remote_pulp_url }}"

etc/kayobe/ansible/requirements.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
collections:
33
- name: stackhpc.cephadm
44
version: 1.22.0
5-
# NOTE: Pinning pulp.squeezer to 0.0.13 because 0.0.14+ depends on the
6-
# pulp_glue Python library being installed.
75
- name: pulp.squeezer
8-
version: 0.0.13
6+
version: 0.2.3
97
- name: stackhpc.pulp
10-
version: 0.5.5
8+
version: full-parallel
9+
type: git
10+
source: https://github.com/stackhpc/ansible-collection-pulp
1111
- name: stackhpc.hashicorp
1212
version: 2.7.1
1313
- name: stackhpc.kayobe_workflows

etc/kayobe/kolla-image-tags.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Dict of Kolla image tags to deploy for each service.
33
# Each key is the tag variable prefix name, and the value is another dict,
44
# where the key is the OS distro and the value is the tag to deploy.
5+
# Foo test ci
56
kolla_image_tags:
67
openstack:
78
rocky-9: 2025.1-rocky-9-20250730T105631

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/18.3.0.6
22
ansible-modules-hashivault>=5.3.0
33
pulp-glue<0.32,>=0.29.2
4+
pulp-glue-deb==0.3.*
45
jmespath

0 commit comments

Comments
 (0)