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

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 c24b5e6a7f..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,60 +1,83 @@
 ---
 # file: roles/cleanup/tasks/sut.yaml
 
-- name: Host cleanup
+- name: Host Cleanup
   block:
-    - name: Kill processes - qemu
+    - name: Kill Processes - Qemu
       import_tasks: kill_process.yaml
       vars:
         process: "qemu"
-      tags: kill-process
+      tags:
+        - kill-process
 
-    - name: Kill processes - l3fwd
+    - name: Kill Processes - L3fwd
       import_tasks: kill_process.yaml
       vars:
         process: "l3fwd"
-      tags: kill-process
+      tags:
+        - kill-process
 
-    - name: Kill processes - testpmd
+    - name: Kill Processes - Testpmd
       import_tasks: kill_process.yaml
       vars:
         process: "testpmd"
-      tags: kill-process
+      tags:
+        - kill-process
 
-    - name: Kill processes - iperf3
+    - name: Kill Processes - iPerf3
       import_tasks: kill_process.yaml
       vars:
         process: "iperf3"
-      tags: kill-process
+      tags:
+        - kill-process
 
-    - name: Kill processes - vpp_echo
+    - name: Kill Processes - vpp_echo
       import_tasks: kill_process.yaml
       vars:
         process: "vpp_echo"
-      tags: kill-process
+      tags:
+        - kill-process
 
-    - name: Remove file or dir - Core zip file
+    - 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
-        path: "/tmp/*tar.lzo.lrz.xz*"
-      tags: remove-file-dir
+      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
+    - name: Remove File Or Dir - Core Dump File
       file:
+        path: "{{ item.path }}"
         state: absent
-        path: "/tmp/*core*"
-      tags: remove-file-dir
+      with_items: "{{ files_to_delete.files }}"
+      tags:
+        - remove-file-dir
 
-    - name: Kill containers - Remove all containers
+    - name: Kill Containers - Remove All Containers
       import_tasks: kill_containers.yaml
-      tags: kill-containers
-
-    - name: Kubernetes - Reset
-      raw: 'kubeadm reset --force'
-      tags: kill-kubernetes
+      tags:
+        - kill-containers
 
-    - name: Remove packages - Remove VPP
+    - name: Remove Packages - Remove VPP
       import_tasks: remove_package.yaml
       vars:
         package: "*vpp*"
-      tags: remove-package
+      tags:
+        - remove-package