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

ci: refs #6695 update Cypress Docker setup and improve container management in Jenkinsfile
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2025-02-19 09:13:53 +01:00
parent 4d058e09da
commit b52955276a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Jenkinsfile vendored
View File

@ -100,9 +100,9 @@ pipeline {
def packageJson = readJSON file: 'package.json' def packageJson = readJSON file: 'package.json'
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}" env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}"
cleanDockerE2E(containerId) cleanDockerE2E()
sh "pnpm exec cypress install" sh "pnpm exec cypress install"
// sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ." sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ."
docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .") docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .")
} }
@ -172,12 +172,12 @@ pipeline {
} }
} }
def cleanDockerE2E(String containerId = null) { 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()) { // if (containerId?.trim()) {
sh "docker rm ${containerId} || true" // sh "docker rm ${containerId} || true"
} // }
} }
} }