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

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 19b7eaf68..0bc657369 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -115,6 +115,7 @@ pipeline {
                                 docker run --network \${env.NETWORK}_e2e-network \\
                                 -e TZ=Europe/Madrid \\
                                 -e DOCKER=true \\
+                                -e CI=true \\
                                 -v \$(pwd):/app \\
                                 -w /app \\
                                 cypress/included:latest \\
@@ -169,8 +170,8 @@ pipeline {
 
 def cleanDockerE2E() {
     script {
-        sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
-        sh "docker rm ${containerId} || true"
+        sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true)
+        sh(script: "docker rm ${containerId}", returnStatus: true)
     }
 }