8714-devToTest #1547

Merged
alexm merged 712 commits from 8714-devToTest into test 2025-03-04 14:08:01 +00:00
2 changed files with 3 additions and 6 deletions
Showing only changes of commit 1d05f9549a - Show all commits

3
Jenkinsfile vendored
View File

@ -107,7 +107,6 @@ pipeline {
environment {
CREDENTIALS = credentials('docker-registry')
CI = 'true'
DOCKER = 'true'
TZ = 'Europe/Madrid'
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}".toLowerCase()
COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml"
@ -116,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 -e DOCKER") {
image.inside("--network ${env.COMPOSE_PROJECT}_default -e TZ -e CI") {
sh 'cypress run --browser chromium --spec test/cypress/integration/claim/claimAction.spec.js'
}
}

View File

@ -12,10 +12,8 @@ services:
command: pnpm exec quasar dev
volumes:
- .:/app
working_dir: /app
environment:
- TZ
- CI
- DOCKER
- CI=true
- TZ=Europe/Madrid
db:
image: registry.verdnatura.es/salix-db:25.10.0-build1343