From 64395e67c1a5d8a0afb297d458c1d10eee393dea Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bgoncalv@redhat.com>
Date: Feb 26 2018 09:04:58 +0000
Subject: execute end.yml before checking results


---

diff --git a/roles/standard-test-basic/tasks/main.yml b/roles/standard-test-basic/tasks/main.yml
index ad84543..9a32655 100644
--- a/roles/standard-test-basic/tasks/main.yml
+++ b/roles/standard-test-basic/tasks/main.yml
@@ -32,13 +32,13 @@
     with_items:
     - "{{ tests }}"
 
+  - include_role:
+      name: str-common
+      tasks_from: end.yml
+
   # Can't go in block. See
   # https://github.com/ansible/ansible/issues/20736
   - name: Check the results
     shell: grep "^FAIL" {{ remote_artifacts }}/test.log
     register: test_fails
     failed_when: test_fails.stdout or test_fails.stderr
-
-  - include_role:
-      name: str-common
-      tasks_from: end.yml
diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index add8c57..26d33a9 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -4,7 +4,7 @@
   block:
   - name: Add restraint repo for restraint-rhts using DNF
     block:
-      - package: dnf-plugins-core state=present
+      - package: name=dnf-plugins-core state=present
       - shell: dnf copr enable -y bpeck/restraint
         ignore_errors: True
     when: "hostvars[test_runner_inventory_name]['is_dnf_os'] | bool"
@@ -112,13 +112,13 @@
     with_items:
     - "{{ tests }}"
 
+  - include_role:
+      name: str-common
+      tasks_from: end.yml
+
   # Can't go in block. See
   # https://github.com/ansible/ansible/issues/20736
   - name: Check the results
     shell: grep "^FAIL" {{ remote_artifacts }}/test.log
     register: test_fails
     failed_when: test_fails.stdout or test_fails.stderr
-
-  - include_role:
-      name: str-common
-      tasks_from: end.yml