From 5ae85989cdb9edff100c0bbc588dfc8859435288 Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Nov 14 2017 13:17:13 +0000
Subject: Fix for Atomic Host installing packages.


Code for installing packages for Atomic Host incorrect uses 'tags' word.

Signed-off-by: Andrei Stepanov <astepano@redhat.com>

---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 81619a7..dd51b78 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -27,6 +27,20 @@
         regex_replace('-debuginfo')
       }}
 
+- name: Target OS identification
+  block:
+    - name: Test if system is Atomic Host
+      lineinfile:
+        name: /etc/os-release
+        regexp: .*Atomic Host.*
+        state: absent
+      check_mode: yes
+      changed_when: False
+      register: os_release_atomic
+    - name: Set Ansible fact 'is_atomic_host'
+      set_fact:
+        is_atomic_host: "{{ os_release_atomic.found > 0 }}"
+
 - block:
   - name: Gather facts
     setup:
@@ -87,21 +101,20 @@
   when: ansible_pkg_mgr != 'unknown'
 
 - block:
-  - name: Check packages required by the test (atomic)
-    shell: rpm -q {{ required_packages|join(" ") }}
+  - name: Check presence of required packages for Atomic Host
+    shell: rpm -q {{ pkgs_ordinary_req|join(" ") }}
     register: package_check
-    changed_when: no
-    failed_when: no
+    changed_when: False
+    failed_when: False
     args: { warn: no }
-
-  - name: Install packages required by the test (atomic)
+  - name: Install required packages at Atomic Host
     shell:
-      rpm-ostree install {{ required_packages|join(" ") }}
+      rpm-ostree install {{ pkgs_ordinary_req|join(" ") }}
       && rpm-ostree ex livefs
     when: package_check.rc != 0
-
-  tags: atomic
-  when: required_packages.0 is defined
+  when:
+    - is_atomic_host
+    - pkgs_ordinary_req
 
 - name: Define remote_artifacts if it is not already defined
   set_fact: