From 8f0f993a64f2eccf8f08b8c1981c4532c105179a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 14:52:11 +0100
Subject: [PATCH] test: refs #6695 better stages

---
 Jenkinsfile | 128 +++++++++++++++++++++++++++-------------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6a65fc69a..3e3122fd2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,74 +66,78 @@ pipeline {
                 sh 'pnpm install --prefer-offline'
             }
         }
-        stage('Test: Unit') {
-            when {
-                expression { !PROTECTED_BRANCH }
-            }
-            environment {
-                NODE_ENV = ""
-            }
-            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')
-            }
+        stage('Test') {
             stages {
-                stage('Setup') {
+                stage('Unit') {
+                    when {
+                        expression { !PROTECTED_BRANCH }
+                    }
+                    environment {
+                        NODE_ENV = ""
+                    }
                     steps {
-                        script {
-                            def packageJson = readJSON file: 'package.json'
-                            env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                        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 {
+                                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') {
+                            parallel {
+                                stage('Database & Backend') {
+                                    steps {
+                                        sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d'
+                                        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('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()
-                        }
-                        sh 'rm -rf salix'
-                        sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
-                    }
-                }
-                stage('Up') {
-                    parallel {
-                        stage('Database & Backend') {
-                            steps {
-                                sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d'
-                                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('Frontend') {
-                            steps {
-                                sh 'docker-compose -f docker-compose.e2e.yml up -d --build front'
-                            }
+                            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') {