From 59a7b1e671151310f7b9ae42d9234c51165cf67d Mon Sep 17 00:00:00 2001
From: Jakub Heger <jheger@redhat.com>
Date: Mar 07 2018 09:02:54 +0000
Subject: [PATCH 1/4] initial commit


---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 3bdf77b..23de128 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -48,11 +48,29 @@
     - "/usr/share/restraint/*"
     - "rpm.py"
 
+# Using different variable to workaround bug https://github.com/ansible/ansible/issues/22025
+- set_fact:
+    test_list: "{{ tests }}"
+
+- name: Generate test list
+  command: "{{ generate_cmd }}"
+  register: cmd_output
+  when:
+    - generate_cmd is defined
+    - generate_cmd != ""
+
+- set_fact:
+    test_list: "{{ test_list + cmd_output.stdout_lines }}"
+  when:
+    - generate_cmd is defined
+    - generate_cmd != ""
+
 - name: Copy tests to test environment
-  synchronize:
-    src: "{{ playbook_dir }}/"
+  copy:
+    src: "{{ item }}"
     dest: "{{ tenv_workdir }}"
-    ssh_args: "-o UserKnownHostsFile=/dev/null"
+  with_items:
+  - "{{ test_list }}"
 
 - name: Fix up beakerlib at tests environment
   shell: >

From c502f4080918dee8f7c445bcdeb126b2efab89eb Mon Sep 17 00:00:00 2001
From: Jakub Heger <jheger@redhat.com>
Date: Mar 07 2018 11:13:17 +0000
Subject: [PATCH 2/4] Forgot to change variables later in the role


---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 23de128..392f9d2 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -111,7 +111,7 @@
         echo "FAIL test {{ item }} does not appear to be a file or directory"
       fi
     with_items:
-    - "{{ tests }}"
+    - "{{ test_list }}"
 
   always:
   - name: Make the master tests summary log artifact
@@ -129,7 +129,7 @@
         echo "UNKNOWN {{ item }}" >> {{ remote_artifacts }}/test.log
       fi
     with_items:
-    - "{{ tests }}"
+    - "{{ test_list }}"
 
   - include_role:
       name: str-common

From b816106f37b269488c3e56ff28b65c83c82939aa Mon Sep 17 00:00:00 2001
From: Jakub Heger <jheger@redhat.com>
Date: Mar 07 2018 13:00:03 +0000
Subject: [PATCH 3/4] changed var name generate_cmd -> tests_generator_cmd


---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 392f9d2..250c99f 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -53,17 +53,17 @@
     test_list: "{{ tests }}"
 
 - name: Generate test list
-  command: "{{ generate_cmd }}"
+  command: "{{ tests_generator_cmd }}"
   register: cmd_output
   when:
-    - generate_cmd is defined
-    - generate_cmd != ""
+    - tests_generator_cmd is defined
+    - tests_generator_cmd != ""
 
 - set_fact:
     test_list: "{{ test_list + cmd_output.stdout_lines }}"
   when:
-    - generate_cmd is defined
-    - generate_cmd != ""
+    - tests_generator_cmd is defined
+    - tests_generator_cmd != ""
 
 - name: Copy tests to test environment
   copy:

From 1d4b0cdf8bf4e9d9340f4cf9124bb4f5685d7357 Mon Sep 17 00:00:00 2001
From: Jakub Heger <jheger@redhat.com>
Date: Mar 08 2018 09:18:42 +0000
Subject: [PATCH 4/4] changed module of test copying task


copy -> synchronize

---

diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 250c99f..c7e739f 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -66,9 +66,10 @@
     - tests_generator_cmd != ""
 
 - name: Copy tests to test environment
-  copy:
+  synchronize:
     src: "{{ item }}"
     dest: "{{ tenv_workdir }}"
+    ssh_args: "-o UserKnownHostsFile=/dev/null"
   with_items:
   - "{{ test_list }}"