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

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 60cd6fa0b..a6d617fa2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -171,12 +171,13 @@ pipeline {
 def cleanDockerE2E() {
     script {
         sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
-        if (containerId) {
+        if (containerId?.trim()) {
             sh "docker rm ${containerId} || true"
         }
     }
 }
 
+
 def checkErrors(String containerId) {
     echo "Container ID: ${containerId}"
     def exitCode = sh(script: "docker inspect -f '{{.State.ExitCode}}' ${containerId}", returnStdout: true).trim()