Merge pull request #1577 from sharelatex/ho-jenkins-github-connection

point to the web-sharelatex-internal repo for github-> jenkins

GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
This commit is contained in:
Henry Oswald 2019-03-04 11:55:29 +00:00 committed by James Allen
parent 491c29bad1
commit 68c7cc6fa3
2 changed files with 2 additions and 2 deletions

View file

@ -209,7 +209,7 @@ clean_css:
clean_ci:
$(DOCKER_COMPOSE) down -v -t 0
docker image prune -af --filter "until=72h"
docker image prune -af --filter "until=48h"
docker network prune -f
test: test_unit test_frontend test_acceptance

View file

@ -10,7 +10,7 @@
"public": "./public"
},
"scripts": {
"test:acceptance:run_dir": "mocha --recursive --reporter spec --timeout 15000 --exit --grep=$MOCHA_GREP $@",
"test:acceptance:run_dir": "mocha --recursive --reporter spec --timeout 25000 --exit --grep=$MOCHA_GREP $@",
"test:unit": "npm -q run compile:app && bin/unit_test --grep=$MOCHA_GREP $@",
"test:unit:ci": "bin/unit_test --timeout 10000",
"test:unit:app": "npm -q run compile:app && bin/unit_test_app $@",