From 38b8a1322525bca8d5fe96a881b3f98108f50b93 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 29 Jan 2025 07:34:37 +0100 Subject: [PATCH] build: refs #6695 try e2e jenkins --- Jenkinsfile | 51 ++++++++++----------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 139d4a46c..eb7c49543 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,7 +66,6 @@ pipeline { sh 'pnpm install --prefer-offline' } } - // UNCOMMENT ME! // stage('Test') { // when { // expression { !PROTECTED_BRANCH } @@ -90,47 +89,17 @@ pipeline { when { expression { !PROTECTED_BRANCH } } - // environment { - // // CREDENTIALS = credentials('docker-registry') - // // IMAGE = "$REGISTRY/salix-back" - // } - steps { - script { - def packageJson = readJSON file: 'package.json' - env.VERSION = "${packageJson.version}-e2e${env.BUILD_ID}" - } - // // sh 'docker pull $IMAGE:dev' - // sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git' - // // sh 'docker ps -a' - // sh 'docker network create salix_default' - // sh 'docker-compose -f docker-compose.yml build db' - // sh 'docker-compose -f docker-compose.yml up db' - // sh 'docker run --name back $IMAGE:dev' - sh 'export VERSION=e2e-try' - sh 'rm -rf salix' - sh 'docker-compose down' - sh 'docker-compose rm' - sh 'docker-compose -f docker-compose.e2e.yml up front --build' - // sh 'docker rm -f back' - // sh 'docker rm -f db' - // sh 'docker rm -f front' - // sh 'docker rm -f e2e' - // sh 'git clone --branch dev https://gitea.verdnatura.es/verdnatura/salix.git' - // sh 'cd front' - // sh '# export VERSION=e2e-try' - // sh 'docker build -f salix/back/Dockerfile -t back ./salix' - // sh 'docker-compose version' - // // // sh 'quasar build' - // // // sh 'docker compose -f docker-compose.e2e.yml build front' - // // // sh 'docker compose -f docker-compose.e2e.yml up 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 e2e' - + environment { + NODE_ENV = "" } - post { + script { + def packageJson = readJSON file: 'package.json' + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" + } + steps { + sh 'docker-compose -f docker-compose.e2e.yml up front --build' + } + post { always { junit( testResults: 'junitresults.xml',