1 files changed, 57 insertions, 55 deletions
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..c24b5e6a7f 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,60 @@
 ---
 # 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: 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