fix(ansible): Cleanup macros

[csit.git] / fdio.infra.ansible / roles / cleanup / tasks / kill_containers.yaml

diff --git a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
index 750572f..dc739eb 100644 (file)
--- a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
@@ -1,38 +1,38 @@
 ---
-# file: roles/cleanup/tasks/kill_containers.yaml
+# file: tasks/kill_containers.yaml
 
 - name: Kill Docker Containers
   block:
-    - name: Kill Container - Get Running Docker Containers
-      shell: "docker ps -aq"
+    - name: Get Running Docker Containers
+      ansible.builtin.shell: "docker ps -a --filter name=DUT -q"
       register: running_containers
       changed_when: false
       tags:
         - kill-containers
 
-    - name: Kill Container - Remove All Docker Containers
-      shell: "docker rm --force {{ item }}"
+    - name: Remove All Docker Containers
+      ansible.builtin.shell: "docker rm --force {{ item }}"
       with_items: "{{ running_containers.stdout_lines }}"
       tags:
         - kill-containers
 
   rescue:
     - name: Restart Docker Daemon
-      systemd:
+      ansible.builtin.systemd:
         name: "docker"
         state: "restarted"
 
 - name: Kill LXC Containers
   block:
-    - name: Kill Container - Get Running LXC Containers
-      shell: "lxc-ls"
+    - name: Get Running LXC Containers
+      ansible.builtin.shell: "lxc-ls"
       register: running_containers
       changed_when: false
       tags:
         - kill-containers
 
-    - name: Kill Container - Remove All LXC Containers
-      shell: "lxc-destroy --force -n {{ item }}"
+    - name: Remove All LXC Containers
+      ansible.builtin.shell: "lxc-destroy --force -n {{ item }}"
       with_items: "{{ running_containers.stdout_lines }}"
       tags:
         - kill-containers