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: 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..f152c8851f 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,21 @@ # 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 +enable_copr_repo: 1 +enable_copr_aux_repo: 1 repos: - - name: "{{ pbench_repo_name }}" + - tag: "{{ pbench_repo_name }}" 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: 1 + enabled: "{{ enable_copr_repo }}" + + - tag: "{{ pbench_aux_repo_name }}" + 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 + enabled: "{{ enable_copr_aux_repo }}"