Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Ansible requirements to all available latest #1494

Open
wants to merge 2 commits into
base: stackhpc/master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ jobs:
matrix:
include:
# NOTE(upgrade): Keep these in sync with Kayobe's supported Ansible and Python versions (see release notes).
- ansible: "2.16"
- ansible: "2.17"
python: "3.12"
- ansible: "2.15"
- ansible: "2.16"
python: "3.10"
name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
Expand Down
74 changes: 12 additions & 62 deletions etc/kayobe/ansible/pulp-artifact-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@
patterns: "{{ file_regex }}"
register: found_files

- 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 }}"
Expand All @@ -49,87 +37,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 }}"
Expand Down
17 changes: 8 additions & 9 deletions etc/kayobe/ansible/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
collections:
- name: stackhpc.cephadm
version: 1.19.1
# 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.1.0
- name: stackhpc.pulp
version: 0.5.5
- name: stackhpc.hashicorp
Expand All @@ -14,18 +12,19 @@ collections:
version: 1.1.0
roles:
- src: stackhpc.vxlan
- name: ansible-lockdown.ubuntu22_cis
src: https://github.com/ansible-lockdown/UBUNTU22-CIS
version: 1.4.1
- name: ansible-lockdown.ubuntu24_cis
src: https://github.com/ansible-lockdown/UBUNTU24-CIS
version: 1.0.0
- name: ansible-lockdown.rhel9_cis
src: https://github.com/ansible-lockdown/RHEL9-CIS
version: 1.3.1
version: v1.3.4
- name: wazuh-ansible
src: https://github.com/stackhpc/wazuh-ansible
version: stackhpc-v4.10.0
- name: geerlingguy.pip
version: 2.2.0
version: 3.1.0
- name: monolithprojects.github_actions_runner
version: 1.18.5
version: 1.21.1
src: https://github.com/MonolithProjects/ansible-github_actions_runner
- src: https://github.com/stackhpc/ansible-role-docker.git
name: geerlingguy.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
features:
- |
Ansible-Galaxy dependencies have been bumped to the latest available
versions. This includes:

pulp.squeezer - 0.0.13 -> 0.1.0
ansible-modules-hashivault - 1.3.1 -> 1.3.4
geerlingguy.pip - 2.2.0 -> 3.1.0
monolithprojects.github_actions_runner - 1.18.5 -> 1.25.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/2024.1
kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/master
ansible-modules-hashivault>=5.2.1
jmespath
Loading