8714-devToTest #1547

Merged
alexm merged 712 commits from 8714-devToTest into test 2025-03-04 14:08:01 +00:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit 4d058e09da - Show all commits

4
Jenkinsfile vendored
View File

@ -100,7 +100,7 @@ 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()
cleanDockerE2E(containerId)
sh "pnpm exec cypress install"
// sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ."
docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .")
@ -172,7 +172,7 @@ pipeline {
}
}
def cleanDockerE2E() {
def cleanDockerE2E(String containerId = null) {
script {
sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
if (containerId?.trim()) {