From 35f90f5ea1a31bcffcbdbaf9e482fc3e726f7b97 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 3 Feb 2025 07:53:43 +0100 Subject: [PATCH] test: refs #6695 better stages --- Jenkinsfile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cce67a5513..e6db94f8c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,6 +90,7 @@ pipeline { expression { !PROTECTED_BRANCH } } environment { + NODE_ENV = "" CREDENTIALS = credentials('docker-registry') } stages { @@ -105,10 +106,14 @@ pipeline { } } stage('Up') { - parallel { - stage('Database & Backend') { + parallel{ + stage('Database') { steps { sh 'cd salix && pnpm i --prefer-offline @verdnatura/myt && npx myt run -t -d' + } + } + stage('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' } @@ -125,14 +130,14 @@ pipeline { sh 'docker-compose -f docker-compose.e2e.yml up e2e' } } - } - post { - always { - cleanDockerE2E() - junit( - testResults: 'junitresults.xml', - allowEmptyResults: true - ) + post { + always { + cleanDockerE2E() + junit( + testResults: 'junitresults.xml', + allowEmptyResults: true + ) + } } } }