diff --git a/Jenkinsfile b/Jenkinsfile index 1c5dc0217a..433de1d17b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,25 +64,26 @@ pipeline { sh 'pnpm install --prefer-offline' } } - stage('Test') { - when { - expression { !PROTECTED_BRANCH } - } - environment { - NODE_ENV = "" - } - steps { - sh 'pnpm run test:unit:ci' - } - post { - always { - junit( - testResults: 'junitresults.xml', - allowEmptyResults: true - ) - } - } - } + // UNCOMMENT ME! + // stage('Test') { + // 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 } @@ -114,11 +115,11 @@ pipeline { // sh 'cd front' // sh '# export VERSION=e2e-try' sh 'docker build -f salix/back/Dockerfile -t back ./salix' + sh 'docker-compose -f docker-compose.e2e.yml up -d --build front' sh 'pnpm i @verdnatura/myt' sh 'cd salix && npx myt run -t --ci -d -n front_default' // sh 'docker-compose -f docker-compose.e2e.yml up --build db' sh 'docker run --net=host -v ./test/cypress/storage:/salix/storage -d back' - sh 'docker-compose -f docker-compose.e2e.yml up -d --build front' sh 'docker-compose -f docker-compose.e2e.yml up e2e' }