From 68c7cc6fa360899e86cd5c93b74045f195c6609f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 4 Mar 2019 11:55:29 +0000 Subject: [PATCH] Merge pull request #1577 from sharelatex/ho-jenkins-github-connection point to the web-sharelatex-internal repo for github-> jenkins GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50 --- services/web/Makefile | 2 +- services/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/Makefile b/services/web/Makefile index d6e3f1890f..5cb19449a4 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -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 diff --git a/services/web/package.json b/services/web/package.json index ae44b7d061..fe6ef7dcf0 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -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 $@",