ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
20e767991b
commit
5927fb4548
|
@ -107,18 +107,14 @@ pipeline {
|
||||||
environment {
|
environment {
|
||||||
CREDENTIALS = credentials('docker-registry')
|
CREDENTIALS = credentials('docker-registry')
|
||||||
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
|
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
|
||||||
COMPOSE_PARAMS = """
|
COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml"
|
||||||
--project-name ${env.COMPOSE_PROJECT}
|
|
||||||
--project-directory .
|
|
||||||
--file test/cypress/docker-compose.yml
|
|
||||||
""".stripIndent()
|
|
||||||
TZ = 'Europe/Madrid'
|
TZ = 'Europe/Madrid'
|
||||||
CI = 'true'
|
CI = 'true'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
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") {
|
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
|
||||||
sh 'cypress run --spec test/cypress/integration/claim/claimAction.spec.js'
|
sh 'cypress run --spec test/cypress/integration/claim/claimAction.spec.js'
|
||||||
}
|
}
|
||||||
|
@ -126,7 +122,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} down"
|
sh "docker compose ${env.COMPOSE_PARAMS} down"
|
||||||
junit(
|
junit(
|
||||||
testResults: 'e2e-junitresults.xml',
|
testResults: 'e2e-junitresults.xml',
|
||||||
allowEmptyResults: true
|
allowEmptyResults: true
|
||||||
|
|
Loading…
Reference in New Issue