diff --git a/Jenkinsfile b/Jenkinsfile index e55999c76..faf86ec0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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" }