From 4d058e09da0c8a7b90c149f12f21aacbedfa82da Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 19 Feb 2025 09:11:52 +0100
Subject: [PATCH] ci: refs #6695 update Cypress Docker setup and improve
 container management in Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index a4c3095a6ec..c1f72ac4588 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ pipeline {
                             def packageJson = readJSON file: 'package.json'
                             env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                             env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}"
-                            cleanDockerE2E()
+                            cleanDockerE2E(containerId)
                             sh "pnpm exec cypress install"
                             // sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ."
                             docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .")
@@ -172,7 +172,7 @@ pipeline {
     }
 }
 
-def cleanDockerE2E() {
+def cleanDockerE2E(String containerId = null) {
     script {
         sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
         if (containerId?.trim()) {