From d94ec646155ce94078290eb49ce7f485bf65cc92 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 20 Feb 2025 18:21:51 +0100 Subject: [PATCH] ci: refs #6695 Docker & Jenkinsfile fixes/refactor --- Jenkinsfile | 2 +- test/cypress/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b48eb26d..38c364227 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -115,7 +115,7 @@ pipeline { script { def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh "docker-compose ${env.COMPOSE_PARAMS} up -d" - image.inside("--network ${env.COMPOSE_PROJECT}_default -e TZ -e CI") { + image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { sh 'cypress run --browser chromium --spec test/cypress/integration/claim/claimAction.spec.js' } } diff --git a/test/cypress/docker-compose.yml b/test/cypress/docker-compose.yml index e1f7c0868..7f84594fb 100644 --- a/test/cypress/docker-compose.yml +++ b/test/cypress/docker-compose.yml @@ -16,4 +16,4 @@ services: - CI - TZ db: - image: registry.verdnatura.es/salix-db:25.10.0-build1343 + image: registry.verdnatura.es/salix-db:dev