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

Fixes to ansible roles (fwd port of #3478) #3479

Merged
merged 2 commits into from
Jul 6, 2023
Merged
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
5 changes: 3 additions & 2 deletions agent/ansible/ansible-lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
skip_list:
- experimental # all rules tagged as experimental
- no-changed-when # Commands should not change things if nothing needs doing.
- experimental # all rules tagged as experimental
- no-changed-when # Commands should not change things if nothing needs doing.
- package-latest # Do not complain about using `latest'
2 changes: 1 addition & 1 deletion agent/ansible/collection/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace: pbench
name: agent

# The version of the collection. Must be compatible with semantic versioning
version: 1.0.7
version: 1.0.11

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- name: Install RPMs
ansible.builtin.package:
name: "{{ item }}"
with_items:
- pbench-agent
- pbench-sysstat
name:
- pbench-agent
- pbench-sysstat
state: latest
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:

- tag: "{{ pbench_aux_repo_name }}"
user: "{{ fedoraproject_username }}"
baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/{{distrodir}}"
baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/{{ distrodir }}"
gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/pubkey.gpg"
gpgcheck: 1
enabled: "{{ enable_copr_aux_repo }}"
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
# Install pbench.repo
- name: Assert pbench_repo_name is defined
assert:
ansible.builtin.assert:
that:
- pbench_repo_name is defined
fail_msg: "Please specify the COPR repository name to use in the `pbench_repo_name` variable"
quiet: true

- name: Ensure we have the pbench.repo file properly in place
ansible.builtin.template:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% for repo in repos %}

[copr-{{ repo.name }}-{{ repo.user }}]
name=COPR {{ repo.name }} ({{ repo.user }}) repo
[copr-{{ repo.tag }}-{{ repo.user }}]
name=COPR {{ repo.tag }} ({{ repo.user }}) repo
baseurl={{ repo.baseurl }}
gpgcheck={{ repo.gpgcheck }}
gpgkey={{ repo.gpgkey }}
Expand Down