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

---
 Jenkinsfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0bc657369..2e6827fa6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -170,8 +170,15 @@ pipeline {
 
 def cleanDockerE2E() {
     script {
-        sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true)
-        sh(script: "docker rm ${containerId}", returnStatus: true)
+        def composeDown = sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true)
+        if (composeDown != 0) {
+            echo "docker-compose down failed, but continuing..."
+        }
+
+        def removeContainer = sh(script: "docker rm ${containerId}", returnStatus: true)
+        if (removeContainer != 0) {
+            echo "Failed to remove container ${containerId}, it probably did not exist."
+        }
     }
 }