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 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b52955276a - Show all commits

12
Jenkinsfile vendored
View File

@ -100,9 +100,9 @@ pipeline {
def packageJson = readJSON file: 'package.json'
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}"
cleanDockerE2E(containerId)
cleanDockerE2E()
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 .")
}
@ -172,12 +172,12 @@ pipeline {
}
}
def cleanDockerE2E(String containerId = null) {
def cleanDockerE2E() {
script {
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
if (containerId?.trim()) {
sh "docker rm ${containerId} || true"
}
// if (containerId?.trim()) {
// sh "docker rm ${containerId} || true"
// }
}
}