From 127a3feaaa758a9c5ca91f656b7943b8241b4ed7 Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Wed, 26 Apr 2023 11:51:37 -0400 Subject: [PATCH 1/3] The `ansible.builtin.command' module does not take a warn argument The argument gives errors now, so delete it. --- .../collection/roles/pbench_clean_yum_cache/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/agent/ansible/collection/roles/pbench_clean_yum_cache/tasks/main.yml b/agent/ansible/collection/roles/pbench_clean_yum_cache/tasks/main.yml index 90b939a304..161f736117 100644 --- a/agent/ansible/collection/roles/pbench_clean_yum_cache/tasks/main.yml +++ b/agent/ansible/collection/roles/pbench_clean_yum_cache/tasks/main.yml @@ -1,8 +1,6 @@ --- - name: Clean yum cache ansible.builtin.command: yum clean all - args: - warn: false - name: Delete /var/cache/yum directory ansible.builtin.file: From 49daf7edea4034a18f3bf6f5c545a20fb744ffda Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Wed, 26 Apr 2023 12:15:33 -0400 Subject: [PATCH 2/3] 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- 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). --- .../roles/pbench_repo_install/defaults/main.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml b/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml index a7e706b41b..7e4eef4e18 100644 --- a/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml +++ b/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml @@ -3,11 +3,19 @@ # provided by the `ndokos` COPR user. fedoraproject_username: ndokos pbench_repo_url_prefix: https://copr-be.cloud.fedoraproject.org/results/{{ fedoraproject_username }} +pbench_aux_repo_name: pbench repos: - - name: "{{ pbench_repo_name }}" - user: "{{ fedoraproject_username }}" + - tag: "{{ pbench_repo_name }}" + user: "{{ fedoraproject_user }}" baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/{{ distrodir }}" gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/pubkey.gpg" gpgcheck: 1 - enabled: 1 + enabled: "{{ enable_copr_repo }}" + + - tag: "{{ pbench_aux_repo_name }}" + user: "{{ fedoraproject_user }}" + 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 }}" From e67eecc2d4affdee54797d16c8ba78fe202b124a Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Tue, 2 May 2023 15:17:24 -0400 Subject: [PATCH 3/3] Fix fedoraproject_username (from review comment) --- .../collection/roles/pbench_repo_install/defaults/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml b/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml index 7e4eef4e18..f152c8851f 100644 --- a/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml +++ b/agent/ansible/collection/roles/pbench_repo_install/defaults/main.yml @@ -4,17 +4,19 @@ fedoraproject_username: ndokos pbench_repo_url_prefix: https://copr-be.cloud.fedoraproject.org/results/{{ fedoraproject_username }} pbench_aux_repo_name: pbench +enable_copr_repo: 1 +enable_copr_aux_repo: 1 repos: - tag: "{{ pbench_repo_name }}" - user: "{{ fedoraproject_user }}" + user: "{{ fedoraproject_username }}" baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/{{ distrodir }}" gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_repo_name }}/pubkey.gpg" gpgcheck: 1 enabled: "{{ enable_copr_repo }}" - tag: "{{ pbench_aux_repo_name }}" - user: "{{ fedoraproject_user }}" + user: "{{ fedoraproject_username }}" baseurl: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/{{distrodir}}" gpgkey: "{{ pbench_repo_url_prefix }}/{{ pbench_aux_repo_name }}/pubkey.gpg" gpgcheck: 1