From e5fe743e0ec04e10de878637b0bce367196cf661 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 19 Feb 2025 08:13:42 +0100
Subject: [PATCH] ci: refs #6695 streamline Cypress E2E test execution in
 Jenkinsfile and improve error handling

---
 Jenkinsfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 10ca2e357..60cd6fa0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -112,13 +112,13 @@ pipeline {
                         script {
                             sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d"
                             def containerId = sh(script: """
-                                docker run --network \${env.NETWORK}_e2e-network \\
-                                -e TZ=Europe/Madrid \\
-                                -e DOCKER=true \\
-                                -e CI=true \\
-                                -v \$(pwd):/app \\
-                                -w /app \\
-                                cypress-setup:latest \\
+                                docker run --network \${env.NETWORK}_e2e-network \
+                                -e TZ=Europe/Madrid \
+                                -e DOCKER=true \
+                                -e CI=true \
+                                -v \\\$(pwd):/app \
+                                -w /app \
+                                cypress-setup:latest \
                                 sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium"
                             """, returnStdout: true).trim()
                             checkErrors(containerId)}
@@ -171,9 +171,9 @@ pipeline {
 def cleanDockerE2E() {
     script {
         sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
-        // if (containerId) {
-        //     sh "docker rm ${containerId} || true"
-        // }
+        if (containerId) {
+            sh "docker rm ${containerId} || true"
+        }
     }
 }