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

---
 Jenkinsfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e0f98e30bc5..87cde918d71 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -111,17 +111,18 @@ pipeline {
                     steps {
                         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 \
-                                sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium"
-                            """, returnStdout: true).trim()
-                            checkErrors(containerId)}
+                            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 \
+                                    sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium"
+                            ''', returnStdout: true).trim()
+                            checkErrors(containerId)
+                        }
                     }
                 }
             }