Avoid shadowing loop variables. (#738)

tests/integration/targets/docker_compose/tasks/main.yml

@@ -23,6 +23,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all containers are removed"

tests/integration/targets/docker_compose/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_container/tasks/main.yml

@@ -37,6 +37,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all containers are removed"

tests/integration/targets/docker_container/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_container_copy_into/tasks/main.yml

@@ -29,6 +29,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all containers are removed"

tests/integration/targets/docker_container_copy_into/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image/tasks/test.yml

@@ -34,6 +34,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all images are removed"

tests/integration/targets/docker_image_build/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image_build/tasks/test.yml

@@ -37,6 +37,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all images are removed"

tests/integration/targets/docker_image_load/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image_load/tasks/test.yml

@@ -18,6 +18,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all images are removed"

tests/integration/targets/docker_image_pull/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image_pull/tasks/test.yml

@@ -18,6 +18,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all images are removed"

tests/integration/targets/docker_image_push/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_image_push/tasks/test.yml

@@ -18,6 +18,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all images are removed"

tests/integration/targets/docker_login/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_login/tasks/test.yml

@@ -7,6 +7,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
   when: docker_api_version is version('1.25', '>=')
 
 - fail: msg="Too old docker / docker-py version to run docker_image tests!"

tests/integration/targets/docker_network/tasks/main.yml

@@ -31,6 +31,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all containers are removed"

tests/integration/targets/docker_network/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_plugin/tasks/main.yml

@@ -20,6 +20,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure plugin is removed"

tests/integration/targets/docker_plugin/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_swarm/tasks/main.yml

@@ -14,9 +14,11 @@
     - docker_api_version is version('1.25', '>=')
 
   block:
-    - include_tasks: "{{ item }}"
+    - include_tasks: run-test.yml
       with_fileglob:
-        - 'tests/*.yml'
+        - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - import_tasks: cleanup.yml

tests/integration/targets/docker_swarm/tasks/run-test.yml

@@ -2,3 +2,6 @@
 # Copyright (c) Ansible Project
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
+
+- name: "Loading tasks from {{ test_name }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_swarm_service/tasks/main.yml

@@ -32,6 +32,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: Make sure all services are removed

tests/integration/targets/docker_swarm_service/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"

tests/integration/targets/docker_volume/tasks/main.yml

@@ -20,6 +20,8 @@
     - include_tasks: run-test.yml
       with_fileglob:
         - "tests/*.yml"
+      loop_control:
+        loop_var: test_name
 
   always:
     - name: "Make sure all volumes are removed"

tests/integration/targets/docker_volume/tasks/run-test.yml

@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: "Loading tasks from {{ item }}"
+- name: "Loading tasks from {{ test_name }}"
-  include_tasks: "{{ item }}"
+  include_tasks: "{{ test_name }}"