verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5739 feat: try run test back and front
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2024-01-15 13:08:34 +01:00
parent 417503bd06
commit f477cdb878
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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"
}

3
back/Dockerfile
View File

@ -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"]

2
e2e/helpers/config.js
View File

@ -1,3 +1,3 @@
module.exports = {
url: 'back:5000'
url: 'http://localhost:5000'
};

2
runTestE2E.sh
View File

@ -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