From 336c678801b3b9457bcca8be044fcc5f4d405f96 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 12 Jan 2024 11:53:58 +0100 Subject: [PATCH] refs #5739 feat: try run test back and front --- Jenkinsfile | 7 +++---- runTestBack.sh | 3 +-- runTestFront.sh | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a9df8d4d..cda5b2d9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,8 +39,8 @@ pipeline { NODE_ENV = "" } steps { - sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml down" - sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm" + sh "docker network rm testing-${env.STACK_NAME}_db_1 -f" + sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm --stop" sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml build --force-rm db" } } @@ -76,8 +76,7 @@ pipeline { TZ = 'Europe/Madrid' } steps { - sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml down" - sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm" + sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm -s -f" // sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm front" } } diff --git a/runTestBack.sh b/runTestBack.sh index 3ad4c77d0..e729dea8a 100644 --- a/runTestBack.sh +++ b/runTestBack.sh @@ -1,5 +1,4 @@ # docker-compose -p salix-testing -f docker-compose.test.yml build --no-cache --force-rm db docker-compose -p salix-testing -f docker-compose.test.yml build --force-rm back db docker-compose -p salix-testing -f docker-compose.test.yml run --rm back -docker-compose -p salix-testing -f docker-compose.test.yml down -docker-compose -p salix-testing -f docker-compose.test.yml rm +docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f diff --git a/runTestFront.sh b/runTestFront.sh index d2ceb3ff9..da374bea3 100644 --- a/runTestFront.sh +++ b/runTestFront.sh @@ -1,4 +1,3 @@ docker-compose -p salix-testing -f docker-compose.test.yml build --force-rm front docker-compose -p salix-testing -f docker-compose.test.yml run --rm front -docker-compose -p salix-testing -f docker-compose.test.yml down -docker-compose -p salix-testing -f docker-compose.test.yml rm +docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f