ci: refs #6695 update Cypress setup in Jenkinsfile to streamline Docker commands
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
40c8daa2ab
commit
a34e21c925
|
@ -114,7 +114,7 @@ pipeline {
|
||||||
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d"
|
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d"
|
||||||
def networkLowerCase = env.NETWORK.toLowerCase()
|
def networkLowerCase = env.NETWORK.toLowerCase()
|
||||||
sh """
|
sh """
|
||||||
docker run -d --rm --name ${env.NETWORK}_cypress \
|
docker run --rm --name ${env.NETWORK}_cypress \
|
||||||
--network ${networkLowerCase}_default \
|
--network ${networkLowerCase}_default \
|
||||||
-e TZ=Europe/Madrid \
|
-e TZ=Europe/Madrid \
|
||||||
-e DOCKER=true \
|
-e DOCKER=true \
|
||||||
|
@ -179,9 +179,7 @@ pipeline {
|
||||||
def cleanDockerE2E() {
|
def cleanDockerE2E() {
|
||||||
script {
|
script {
|
||||||
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
|
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
|
||||||
// if (containerId?.trim()) {
|
sh "docker rm -f ${env.NETWORK}_cypress || true"
|
||||||
// sh "docker rm ${containerId} || true"
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue