From a34e21c92570493577964900c40c2865caab44d2 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 19 Feb 2025 09:54:52 +0100 Subject: [PATCH] ci: refs #6695 update Cypress setup in Jenkinsfile to streamline Docker commands --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e58d08db..d9ee85371 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,7 @@ pipeline { sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d" def networkLowerCase = env.NETWORK.toLowerCase() sh """ - docker run -d --rm --name ${env.NETWORK}_cypress \ + docker run --rm --name ${env.NETWORK}_cypress \ --network ${networkLowerCase}_default \ -e TZ=Europe/Madrid \ -e DOCKER=true \ @@ -179,9 +179,7 @@ pipeline { def cleanDockerE2E() { script { sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true" - // if (containerId?.trim()) { - // sh "docker rm ${containerId} || true" - // } + sh "docker rm -f ${env.NETWORK}_cypress || true" } }