From 1de829f016d7a06f9ddec1718b618f9415442d7f Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 19 Feb 2025 12:29:41 +0100 Subject: [PATCH] ci: refs #6695 try --- Jenkinsfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff958334096..5cacc5201b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,18 +101,20 @@ pipeline { docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .") sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d" - // def networkLowerCase = env.NETWORK.toLowerCase() - // def image = docker.image('cypress-setup', "-f ./test/cypress/Dockerfile .") - // image.inside(""" - // --network ${networkLowerCase}_default \ - // -e TZ=Europe/Madrid \ - // -e DOCKER=true \ - // -e CI=true \ - // -v .:/app \ - // -w /app \ - // """) { - // sh 'pnpm exec cypress run --browser chromium' - // } + + def networkLowerCase = env.NETWORK.toLowerCase() + def image = docker.image('cypress-setup:latest') + image.inside(""" + --network ${networkLowerCase}_default \ + -e TZ=Europe/Madrid \ + -e DOCKER=true \ + -e CI=true \ + -v .:/app \ + -w /app \ + """) { + sh 'pnpm exec cypress run --browser chromium' + } + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down" } }