From 79e2a7ee25a42560178758218d1d36b7dc5bb2ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 13 Feb 2025 09:08:45 +0100
Subject: [PATCH] refactor: refs #6695 simplify Docker cleanup commands in
 Jenkinsfile

---
 Jenkinsfile | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e6f07367a..531451ea5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -178,30 +178,9 @@ def cleanDockerE2E() {
     script {
         def projectBranch = "${PROJECT_NAME}-${env.BRANCH_NAME}".toLowerCase()
         // STOP AND REMOVE
-        def containers = sh(script: """
-            docker ps --filter "name=^${projectBranch}" --format "{{.ID}}"
-        """, returnStdout: true).trim()
+        sh """docker ps -a --filter "name=^${projectBranch}" | awk 'NR>1 {print $1}' | xargs -r docker rm -v || true"""
+        sh """docker network ls --filter "name=^${projectBranch}" | awk 'NR>1 {print $1}' | xargs -r docker network rm || true"""
 
-        if (containers) {
-            sh(script: """
-                echo '${containers}' | xargs docker stop
-                echo '${containers}' | xargs docker rm
-            """)
-        } else {
-            echo "No se encontraron contenedores con el prefijo '${projectBranch}'."
-        }
-
-        def networks = sh(script: """
-            docker network ls --filter "name=^${projectBranch}" --format "{{.ID}}"
-        """, returnStdout: true).trim()
-
-         if (networks) {
-            sh(script: """
-                echo '${networks}' | xargs docker network rm
-            """)
-        } else {
-            echo "No se encontraron redes con el prefijo '${projectBranch}'."
-        }
     }
 }