From c47bdd6b9d7f4b2348aa72dcf62a56185b5fced9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 14:18:16 +0100
Subject: [PATCH] test: refs #6695 better clean

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

diff --git a/Jenkinsfile b/Jenkinsfile
index ba2b818b7..a86945a5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,6 +100,7 @@ pipeline {
                                 script {
                                     def packageJson = readJSON file: 'package.json'
                                     env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                                    cleanDockerE2E()
                                 }
                                 sh 'rm -rf salix'
                                 sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
@@ -118,7 +119,6 @@ pipeline {
                         }
                         stage('Up Frontend') {
                             steps {
-                                sh 'quasar build'
                                 sh 'docker-compose -f docker-compose.e2e.yml up -d --build front'
                             }
                         }
@@ -130,10 +130,7 @@ pipeline {
                     }
                     post {
                         always {
-                            sh 'docker rm -f vn-database || true'
-                            sh 'docker rm -f salix_e2e || true'
-                            sh 'docker-compose -f docker-compose.e2e.yml down || true'
-
+                            cleanDockerE2E()
                             junit(
                                 testResults: 'junitresults.xml',
                                 allowEmptyResults: true
@@ -182,3 +179,11 @@ pipeline {
         }
     }
 }
+
+def cleanDockerE2E() {
+    script {
+        sh 'docker rm -f vn-database || true'
+        sh 'docker rm -f salix_e2e || true'
+        sh 'docker-compose -f docker-compose.e2e.yml down || true'
+    }
+}