Skip to content

Commit e5d4efa

Browse files
authored
Ansible fixes (#3420)
Forward port of #3407 from b0.72. * The `ansible.builtin.command' module does not take a warn argument The argument gives errors now, so delete it. * There are now two repos for pbench-agent The pbench repo contains RPMs for pbench-sysstat and screen (the latter for *some* distros, mainly RHEL8 - RHEL9 picks up screen from EPEL). The pbench-<version> repo contains the RPM for the latest release of pbench-agent (and possibly a server RPM although we don't install RPMs for the server: containers have taken over).
1 parent 9509d23 commit e5d4efa

File tree

2 files changed

+12
-4
lines changed
  • agent/ansible/collection/roles

2 files changed

+12
-4
lines changed

agent/ansible/collection/roles/pbench_clean_yum_cache/tasks/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
- name: Clean yum cache
33
ansible.builtin.command: yum clean all
4-
args:
5-
warn: false
64

75
- name: Delete /var/cache/yum directory
86
ansible.builtin.file:

agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,21 @@
33
# provided by the `ndokos` COPR user.
44
fedoraproject_username: ndokos
55
pbench_repo_url_prefix: https://copr-be.cloud.fedoraproject.org/results/{{ fedoraproject_username }}
6+
pbench_aux_repo_name: pbench
7+
enable_copr_repo: 1
8+
enable_copr_aux_repo: 1
69

710
repos:
8-
- name: "{{ pbench_repo_name }}"
11+
- tag: "{{ pbench_repo_name }}"
912
user: "{{ fedoraproject_username }}"
1013
baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/{{ distrodir }}"
1114
gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/pubkey.gpg"
1215
gpgcheck: 1
13-
enabled: 1
16+
enabled: "{{ enable_copr_repo }}"
17+
18+
- tag: "{{ pbench_aux_repo_name }}"
19+
user: "{{ fedoraproject_username }}"
20+
baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/{{distrodir}}"
21+
gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/pubkey.gpg"
22+
gpgcheck: 1
23+
enabled: "{{ enable_copr_aux_repo }}"

0 commit comments

Comments
 (0)