From a12d1f0647f12ffc51721cb0f0564eb4283a9c54 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 20 Feb 2025 17:42:04 +0100 Subject: [PATCH] ci: refs #6695 Docker & Jenkinsfile fixes/refactor --- Jenkinsfile | 3 ++- test/cypress/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b775b11c48..947c66f7d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -115,7 +115,8 @@ 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=true") { + image.inside("--network ${env.COMPOSE_PROJECT}_default -e TZ -e CI") { + sh 'echo $CI $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 d53eaa1fbb..e1f7c0868a 100644 --- a/test/cypress/docker-compose.yml +++ b/test/cypress/docker-compose.yml @@ -13,7 +13,7 @@ services: volumes: - .:/app environment: - - CI=true - - TZ=Europe/Madrid + - CI + - TZ db: image: registry.verdnatura.es/salix-db:25.10.0-build1343