X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcleanup%2Ftasks%2Fsut.yaml;h=d80a35b1cb386653003852a8b4b7ba6fda07971b;hp=b3f8fffea23adcac7b4d3725cc2c37d9c3cd5907;hb=a9817d4b5ce0296062b49e100705661f32b77dc6;hpb=b340b5c9925b43869b91197850504760757a0bfe

diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml
index b3f8fffea2..d80a35b1cb 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml
@@ -1,58 +1,83 @@
 ---
 # file: roles/cleanup/tasks/sut.yaml
 
-- name: Kill processes - qemu
-  import_tasks: kill_process.yaml
-  vars:
-    process: "qemu"
-  tags: kill-process
-
-- name: Kill processes - l3fwd
-  import_tasks: kill_process.yaml
-  vars:
-    process: "l3fwd"
-  tags: kill-process
-
-- name: Kill processes - testpmd
-  import_tasks: kill_process.yaml
-  vars:
-    process: "testpmd"
-  tags: kill-process
-
-- name: Kill processes - iperf3
-  import_tasks: kill_process.yaml
-  vars:
-    process: "iperf3"
-  tags: kill-process
-
-- name: Kill processes - vpp_echo
-  import_tasks: kill_process.yaml
-  vars:
-    process: "vpp_echo"
-  tags: kill-process
-
-- name: Remove file or dir - Core zip file
-  file:
-    state: absent
-    path: "/tmp/*tar.lzo.lrz.xz*"
-  tags: remove-file-dir
-
-- name: Remove file or dir - Core dump file
-  file:
-    state: absent
-    path: "/tmp/*core*"
-  tags: remove-file-dir
-
-- name: Kill containers - Remove all containers
-  import_tasks: kill_containers.yaml
-  tags: kill-containers
-
-- name: Kubernetes - Reset
-  raw: 'kubeadm reset --force'
-  tags: kill-kubernetes
-
-- name: Remove packages - Remove VPP
-  import_tasks: remove_package.yaml
-  vars:
-    package: "*vpp*"
-  tags: remove-package
+- name: Host Cleanup
+  block:
+    - name: Kill Processes - Qemu
+      import_tasks: kill_process.yaml
+      vars:
+        process: "qemu"
+      tags:
+        - kill-process
+
+    - name: Kill Processes - L3fwd
+      import_tasks: kill_process.yaml
+      vars:
+        process: "l3fwd"
+      tags:
+        - kill-process
+
+    - name: Kill Processes - Testpmd
+      import_tasks: kill_process.yaml
+      vars:
+        process: "testpmd"
+      tags:
+        - kill-process
+
+    - name: Kill Processes - iPerf3
+      import_tasks: kill_process.yaml
+      vars:
+        process: "iperf3"
+      tags:
+        - kill-process
+
+    - name: Kill Processes - vpp_echo
+      import_tasks: kill_process.yaml
+      vars:
+        process: "vpp_echo"
+      tags:
+        - kill-process
+
+    - name: Find File Or Dir - Core Zip File
+      find:
+        paths: "/tmp/"
+        patterns: "*tar.lzo.lrz.xz*"
+      register: files_to_delete
+      tags:
+        - remove-file-dir
+
+    - name: Remove File Or Dir - Core Zip File
+      file:
+        path: "{{ item.path }}"
+        state: absent
+      with_items: "{{ files_to_delete.files }}"
+      tags:
+        - remove-file-dir
+
+    - name: Find File Or Dir - Core Dump File
+      find:
+        paths: "/tmp/"
+        patterns: "*core*"
+      register: files_to_delete
+      tags:
+        - remove-file-dir
+
+    - name: Remove File Or Dir - Core Dump File
+      file:
+        path: "{{ item.path }}"
+        state: absent
+      with_items: "{{ files_to_delete.files }}"
+      tags:
+        - remove-file-dir
+
+    - name: Kill Containers - Remove All Containers
+      import_tasks: kill_containers.yaml
+      tags:
+        - kill-containers
+
+    - name: Remove Packages - Remove VPP
+      import_tasks: remove_package.yaml
+      vars:
+        package: "*vpp*"
+      tags:
+        - remove-package