From d9602307c99d2e57d3313afc73634d4211060dc1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 10:07:41 +0100
Subject: [PATCH] feat: refs #6695 better stages for e2e

---
 Jenkinsfile | 56 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4e8cf8a266..9527003e32 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,27 +73,43 @@ pipeline {
             environment {
                 CREDENTIALS = credentials('docker-registry')
             }
-            steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+            script {
+                def packageJson = readJSON file: 'package.json'
+                env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+            }
+            stages {
+                stage('Network') {
+                    steps {
+                        // sh "docker network rm e2e_default || true"
+                        // sh 'docker network create e2e_default || true'
+                    }
+                }
+                stage('DB') {
+                    steps {
+                        sh 'rm -rf salix'
+                        sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
+                        sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d'
+                    }
+                }
+                stage('Back') {
+                    steps {
+                        sh 'docker build -f ./salix/back/Dockerfile -t back ./salix'
+                        sh 'docker run -d --name salix --net=host -v $(pwd)/test/cypress/storage:/salix/storage back'
+                    }
+                }
+                stage('Front') {
+                    steps {
+                        sh 'quasar build'
+                        sh 'docker-compose -f docker-compose.e2e.yml build front'
+                        sh 'docker-compose -f docker-compose.e2e.yml up -d front'
+                    }
+                }
+                stage('Test') {
+                    steps {
+                        sh 'docker-compose -f docker-compose.e2e.yml build e2e'
+                        sh 'docker-compose -f docker-compose.e2e.yml up e2e'
+                    }
                 }
-                // sh "docker network rm e2e_default || true"
-                // sh 'docker network create e2e_default || true'
-                sh 'rm -rf salix'
-                sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
-                // Db
-                sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d'
-                // Backend
-                sh 'docker build -f ./salix/back/Dockerfile -t back ./salix'
-                sh 'docker run -d --name salix --net=host -v $(pwd)/test/cypress/storage:/salix/storage back'
-                // Frontend
-                sh 'quasar build'
-                sh 'docker-compose -f docker-compose.e2e.yml build front'
-                sh 'docker-compose -f docker-compose.e2e.yml up -d front'
-                // E2E
-                sh 'docker-compose -f docker-compose.e2e.yml build e2e'
-                sh 'docker-compose -f docker-compose.e2e.yml up e2e'
             }
             post {
                 always {