From 438f4d46de434b99848e9c6b4bd608e7e4a51d6c Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Feb 09 2018 10:07:52 +0000
Subject: standard-test-beakerlib: fix rhel support


Do not install yum-plugin-copr for later releses.

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 7863ed3..910da5c 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -5,14 +5,14 @@
   - name: Add restraint repo for restraint-rhts on Fedora hosts
     shell: dnf copr enable -y bpeck/restraint
     ignore_errors: True
-    when: hostvars[test_runner_inventory_name]['ansible_distribution'] == 'Fedora'
+    when: hostvars[test_runner_inventory_name]['is_dnf_os']
 
   - name: Add restraint repo for restraint-rhts on RHEL/CentOS hosts
     block:
       - package: name=yum-plugin-copr
       - shell: yum copr -y enable bpeck/restraint
         ignore_errors: True
-    when: "[hostvars[test_runner_inventory_name]['ansible_distribution'] ] | intersect(['RedHat', 'CentOS'])"
+    when: hostvars[test_runner_inventory_name]['is_yum_os']
 
   - name: Install the beakerlib requirements
     package: name={{item}} state=present
diff --git a/roles/str-common/tasks/inspect.yml b/roles/str-common/tasks/inspect.yml
index 316d48f..f4cb6f9 100644
--- a/roles/str-common/tasks/inspect.yml
+++ b/roles/str-common/tasks/inspect.yml
@@ -13,3 +13,22 @@
     - debug:
         msg: "System is Atomic Host: {{ is_atomic }}"
         verbosity: 1
+
+#
+# RedHat and CentOS versions 6 and 7 are yum based
+#
+- name: Set test_runner_is_yum_based
+  set_fact:
+    is_yum_os: True
+    is_dnf_os: False
+  when:
+    - "['ansible_distribution'] | intersect(['RedHat', 'CentOS']) and ansible_distribution_version|int <= 7"
+
+#
+# Fedora and later RHEL/CentOS versions are dnf based
+#
+- name: Set test_runner_is_dnf_based
+  set_fact:
+    is_yum_os: False
+    is_dnf_os: True
+  when: is_yum_os is undefined
diff --git a/roles/str-common/tasks/main.yml b/roles/str-common/tasks/main.yml
index 04e7c01..c65a5ac 100644
--- a/roles/str-common/tasks/main.yml
+++ b/roles/str-common/tasks/main.yml
@@ -1,5 +1,7 @@
-- import_tasks: inspect.yml
 - import_tasks: trunner.yml
+- import_tasks: inspect.yml
+- import_tasks: inspect.yml
+  delegate_to: "{{ test_runner_inventory_name }}"
 - import_tasks: pkgs.yml