X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fcleanup%2Ftasks%2Fkill_containers.yaml;h=22239b1ebbe8da9096caeb4ed0b802cda0300a8c;hb=d4f8ab4aa9b8f918e31d85802dad62a225bbe775;hp=750572feb938acc7502e643018d4da6ba3e28a2c;hpb=d41a5490f30a161561c39c4f1b08add17b9cf6f7;p=csit.git

diff --git a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
index 750572feb9..22239b1ebb 100644
--- a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml
@@ -4,35 +4,35 @@
 - name: Kill Docker Containers
   block:
     - name: Kill Container - Get Running Docker Containers
-      shell: "docker ps -aq"
+      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 }}"
+      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"
+      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 }}"
+      ansible.builtin.shell: "lxc-destroy --force -n {{ item }}"
       with_items: "{{ running_containers.stdout_lines }}"
       tags:
         - kill-containers