verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 82 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 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b3cbaed79 - Show all commits

8
Jenkinsfile vendored
View File

@ -174,8 +174,10 @@ def cleanDockerE2E() {
sh "docker ps"
def projectBranch = "${PROJECT_NAME}-${env.BRANCH_NAME}".toLowerCase()
echo "${projectBranch}"
def containers = sh(script: """
docker ps --filter "name=^${PROJECT_NAME}-${env.BRANCH_NAME}" --format "{{.ID}}"
docker ps --filter "name=^${projectBranch} --format "{{.ID}}"
""", returnStdout: true).trim()
if (containers) {
@ -186,7 +188,7 @@ def cleanDockerE2E() {
echo '${containers}' | xargs docker stop
""")
} else {
echo "No se encontraron contenedores con el prefijo '${PROJECT_NAME}-${env.BRANCH_NAME}'."
echo "No se encontraron contenedores con el prefijo '${projectBranch}'."
}
}
@ -205,7 +207,7 @@ def runTestsInParallel() {
tasks["e2e_${folderName}"] = {
script {
sh "docker-compose -p ${env.NETWORK}_${folderName} -f docker-compose.e2e.yml up -d back vn-database"
sh "docker-compose -p ${env.NETWORK}_${folderName} -f docker-compose.e2e.yml up -d back"
sh "docker-compose -p ${env.NETWORK}_${folderName} -f docker-compose.e2e.yml up -d front"
sh "docker-compose -p ${env.NETWORK}_${folderName} -f docker-compose.e2e.yml up e2e"
}