From 3de59d6fb8f3fd39ce4cbcd4777cefdfb48a70c8 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 14:49:34 +0100 Subject: [PATCH] fix: refs #6695 try parallel --- Jenkinsfile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f973d3d3f2..e55999c76f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -174,24 +174,20 @@ def cleanDockerE2E() { sh "docker ps" - sh "docker ps --filter name=^${PROJECT_NAME}-${env.BRANCH_NAME} -q" - // def containers = sh(script: "docker ps -q --filter name=^${PROJECT_NAME}-${env.BRANCH_NAME}", returnStdout: true).trim() - // if (containers) { - // echo "${containers}" - // sh "docker stop ${containers}" - // sh "docker rm ${containers}" - // } else { - // echo "No se encontraron redes para eliminar." - // } + def containers = sh(script: """ + docker ps --filter "name=^${PROJECT_NAME}-${env.BRANCH_NAME}" --format "{{.ID}}" + """, returnStdout: true).trim() - // def networks = sh(script: "docker network ls --filter name=^${PROJECT_NAME}-${env.BRANCH_NAME} -q", returnStdout: true).trim() - // if (networks) { - // echo "${networks}" - // // sh "docker network rm ${networks}" - // } else { - // echo "No se encontraron redes para eliminar." - // } + if (containers) { + echo "Contenedores encontrados: ${containers}" + // Detener cada contenedor + sh(script: """ + echo '${containers}' | xargs docker stop + """) + } else { + echo "No se encontraron contenedores con el prefijo '${PROJECT_NAME}-${env.BRANCH_NAME}'." + } } }