diff --git a/Jenkinsfile b/Jenkinsfile index 94d6744f66..08e0647dea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,18 +107,14 @@ pipeline { environment { CREDENTIALS = credentials('docker-registry') COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" - COMPOSE_PARAMS = """ - --project-name ${env.COMPOSE_PROJECT} - --project-directory . - --file test/cypress/docker-compose.yml - """.stripIndent() + COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml" TZ = 'Europe/Madrid' CI = 'true' } steps { script { def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') - sh "docker-compose ${env.COMPOSE_PARAMS} up -d" + sh "docker compose ${env.COMPOSE_PARAMS} up -d" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { sh 'cypress run --spec test/cypress/integration/claim/claimAction.spec.js' } @@ -126,7 +122,7 @@ pipeline { } post { always { - sh "docker-compose ${env.COMPOSE_PARAMS} down" + sh "docker compose ${env.COMPOSE_PARAMS} down" junit( testResults: 'e2e-junitresults.xml', allowEmptyResults: true