verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 84 Releases Wiki Activity

8714-devToTest #1547

Merged
alexm merged 712 commits from 8714-devToTest into test 2025-03-04 14:08:01 +00:00
Conversation 0 Commits 712 Files Changed 111 +10 -10
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5fe743e0e - Show all commits

20
Jenkinsfile vendored
View File

@ -112,13 +112,13 @@ pipeline {
script {
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d"
def containerId = sh(script: """
docker run --network \${env.NETWORK}_e2e-network \\
-e TZ=Europe/Madrid \\
-e DOCKER=true \\
-e CI=true \\
-v \$(pwd):/app \\
-w /app \\
cypress-setup:latest \\
docker run --network \${env.NETWORK}_e2e-network \
-e TZ=Europe/Madrid \
-e DOCKER=true \
-e CI=true \
-v \\\$(pwd):/app \
-w /app \
cypress-setup:latest \
sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium"
""", returnStdout: true).trim()
checkErrors(containerId)}
@ -171,9 +171,9 @@ pipeline {
def cleanDockerE2E() {
script {
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
// if (containerId) {
// sh "docker rm ${containerId} || true"
// }
if (containerId) {
sh "docker rm ${containerId} || true"
}
}
}