From f477cdb878f799de7f3137bc4062ddd56626426d Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 15 Jan 2024 13:08:34 +0100 Subject: [PATCH] refs #5739 feat: try run test back and front --- Jenkinsfile | 2 +- back/Dockerfile | 3 ++- e2e/helpers/config.js | 2 +- runTestE2E.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d46efad5..10a7a98cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { } steps { // sh "docker network ls | grep testing-\${env.STACK_NAME} | awk '{print \$1}' | xargs -r docker network rm" - sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm" + // sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm" 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 back" } diff --git a/back/Dockerfile b/back/Dockerfile index 87abe87c0..69b96f0d7 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -56,6 +56,7 @@ COPY modules modules COPY print print COPY storage storage +CMD ["npx", "gulp", "backOnly"] + -# CMD ["npx", "gulp", "backOnly"] # CMD ["node", "back/tests.js", "ci"] diff --git a/e2e/helpers/config.js b/e2e/helpers/config.js index 7c552f866..8e5bda96c 100644 --- a/e2e/helpers/config.js +++ b/e2e/helpers/config.js @@ -1,3 +1,3 @@ module.exports = { - url: 'back:5000' + url: 'http://localhost:5000' }; diff --git a/runTestE2E.sh b/runTestE2E.sh index fde3e3383..df1ff889c 100644 --- a/runTestE2E.sh +++ b/runTestE2E.sh @@ -3,6 +3,6 @@ docker-compose -p salix-test -f docker-compose.test.yml build --force-rm back docker-compose -p salix-test -f docker-compose.test.yml build --force-rm front docker-compose -p salix-test -f docker-compose.test.yml build --force-rm e2e docker-compose -p salix-test -f docker-compose.test.yml run e2e #--rm -docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f +docker-compose -p salix-test -f docker-compose.test.yml rm -s -v -f # docker-compose -p salix-test -f docker-compose.test.yml down # docker-compose -p salix-test -f docker-compose.test.yml rm