Bläddra i källkod

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

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

GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
Henry Oswald 7 år sedan
förälder
incheckning
68c7cc6fa3
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      services/web/Makefile
  2. 1 1
      services/web/package.json

+ 1 - 1
services/web/Makefile

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

+ 1 - 1
services/web/package.json

@@ -10,7 +10,7 @@
     "public": "./public"
     "public": "./public"
   },
   },
   "scripts": {
   "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": "npm -q run compile:app && bin/unit_test --grep=$MOCHA_GREP $@",
     "test:unit:ci": "bin/unit_test --timeout 10000",
     "test:unit:ci": "bin/unit_test --timeout 10000",
     "test:unit:app": "npm -q run compile:app && bin/unit_test_app $@",
     "test:unit:app": "npm -q run compile:app && bin/unit_test_app $@",