From 900b76a4dbee37ba28448b82e1c68850406d71d3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 14:50:03 +0100
Subject: [PATCH] test: refs #6695 back and front in parallel

---
 Jenkinsfile | 99 +++++++++++++++++++++++++----------------------------
 1 file changed, 46 insertions(+), 53 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a86945a5e..6a65fc69a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,83 +66,76 @@ pipeline {
                 sh 'pnpm install --prefer-offline'
             }
         }
-        stage('Test') {
+        stage('Test: Unit') {
             when {
                 expression { !PROTECTED_BRANCH }
             }
             environment {
                 NODE_ENV = ""
             }
-            parallel{
-                stage('Unit') {
+            steps {
+                sh 'pnpm run test:unit:ci'
+            }
+            post {
+                always {
+                    junit(
+                        testResults: 'junitresults.xml',
+                        allowEmptyResults: true
+                    )
+                }
+            }
+        }
+        stage('E2E') {
+            when {
+                expression { !PROTECTED_BRANCH }
+            }
+            environment {
+                CREDENTIALS = credentials('docker-registry')
+            }
+            stages {
+                stage('Setup') {
                     steps {
-                        sh 'pnpm run test:unit:ci'
-                    }
-                    post {
-                        always {
-                            junit(
-                                testResults: 'junitresults.xml',
-                                allowEmptyResults: true
-                            )
+                        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'
                     }
                 }
-                stage('E2E') {
-                    when {
-                        expression { !PROTECTED_BRANCH }
-                    }
-                    environment {
-                        CREDENTIALS = credentials('docker-registry')
-                    }
-                    stages {
-                        stage('Setup') {
-                            steps {
-                                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'
-                            }
-                        }
-                        stage('Up Database') {
+                stage('Up') {
+                    parallel {
+                        stage('Database & Backend') {
                             steps {
                                 sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d'
-                            }
-                        }
-                        stage('Up Backend') {
-                            steps {
                                 sh 'docker build -f ./salix/back/Dockerfile -t back ./salix'
                                 sh 'docker run -d --name salix_e2e --net=host -v $(pwd)/test/cypress/storage:/salix/storage back'
                             }
                         }
-                        stage('Up Frontend') {
+                        stage('Frontend') {
                             steps {
                                 sh 'docker-compose -f docker-compose.e2e.yml up -d --build front'
                             }
                         }
-                        stage('Run E2E') {
-                            steps {
-                                sh 'docker-compose -f docker-compose.e2e.yml up e2e'
-                            }
-                        }
-                    }
-                    post {
-                        always {
-                            cleanDockerE2E()
-                            junit(
-                                testResults: 'junitresults.xml',
-                                allowEmptyResults: true
-                            )
-                        }
                     }
                 }
-
+                stage('Run E2E') {
+                    steps {
+                        sh 'docker-compose -f docker-compose.e2e.yml up e2e'
+                    }
+                }
+            }
+            post {
+                always {
+                    cleanDockerE2E()
+                    junit(
+                        testResults: 'junitresults.xml',
+                        allowEmptyResults: true
+                    )
+                }
             }
-
         }
-
         stage('Build') {
             when {
                 expression { PROTECTED_BRANCH }