From d246412b273747965f5a86bdb4319502263ba64d Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Oct 27 2017 12:24:45 +0000 Subject: Location for restraint repo file for Fedora Rawhide Manage COPR restraint repos in a unified way. Tries to solve: https://pagure.io/standard-test-roles/issue/68 Signed-off-by: Andrei Stepanov --- diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml index f6c6df1..7c5c62a 100644 --- a/roles/standard-test-beakerlib/tasks/main.yml +++ b/roles/standard-test-beakerlib/tasks/main.yml @@ -12,16 +12,14 @@ delegate_facts: True - name: Add restraint repo for restraint-rhts on Fedora hosts - get_url: - url: https://copr.fedorainfracloud.org/coprs/bpeck/restraint/repo/fedora-{{ansible_distribution_major_version}}/bpeck-restraint-fedora-{{ansible_distribution_major_version}}.repo - dest: /etc/yum.repos.d/restraint.repo + shell: dnf copr enable -y bpeck/restraint when: ansible_distribution == 'Fedora' - name: Add restraint repo for restraint-rhts on RHEL/CentOS hosts - get_url: - url: https://copr.fedorainfracloud.org/coprs/bpeck/restraint/repo/epel-7/bpeck-restraint-epel-7.repo - dest: /etc/yum.repos.d/restraint.repo - when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' + block: + - package: name=yum-plugin-copr + - shell: yum copr -y enable bpeck/restraint + when: "[ansible_distribution] | intersect(['RedHat', 'CentOS'])" - name: Install the beakerlib requirements package: name={{item}} state=latest