From a6ab549d29419714c4d3d141cd5c1fa9514c277b Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Tue, 29 May 2018 15:39:52 +0100
Subject: [PATCH] Update build_scripts to 1.1.4 (draft)

---
 services/track-changes/Jenkinsfile           | 2 +-
 services/track-changes/Makefile              | 4 ++--
 services/track-changes/docker-compose.ci.yml | 5 +++--
 services/track-changes/docker-compose.yml    | 4 ++--
 services/track-changes/package.json          | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/services/track-changes/Jenkinsfile b/services/track-changes/Jenkinsfile
index e8eefc2e9d..a779f94b6f 100644
--- a/services/track-changes/Jenkinsfile
+++ b/services/track-changes/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
     stage('Acceptance Tests') {
       steps {
         withCredentials([usernamePassword(credentialsId: 'S3_DOCSTORE_TEST_AWS_KEYS', passwordVariable: 'AWS_SECRET_ACCESS_KEY', usernameVariable: 'AWS_ACCESS_KEY_ID')]) {
-          sh 'AWS_BUCKET="sl-doc-archive-testing" AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
+          sh 'AWS_BUCKET="sl-acceptance-tests" AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
         }
       }
     }
diff --git a/services/track-changes/Makefile b/services/track-changes/Makefile
index b26c530f57..bb921ac06f 100644
--- a/services/track-changes/Makefile
+++ b/services/track-changes/Makefile
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.3
+# Version: 1.1.4
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -14,7 +14,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 	AWS_BUCKET=${AWS_BUCKET} \
 	AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
 	AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-	docker-compose ${DOCKER_COMPOSE_FLAGS} 
+	docker-compose ${DOCKER_COMPOSE_FLAGS}
 
 
 clean:
diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml
index 18a454adfd..b82ec852ac 100644
--- a/services/track-changes/docker-compose.ci.yml
+++ b/services/track-changes/docker-compose.ci.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.3
+# Version: 1.1.4
 
 version: "2"
 
@@ -18,9 +18,10 @@ services:
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_BUCKET: ${AWS_BUCKET}
+      MOCHA_GREP: ${MOCHA_GREP}
     depends_on:
       - mongo
       - redis
diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml
index 31fe46d3ed..fd540dae99 100644
--- a/services/track-changes/docker-compose.yml
+++ b/services/track-changes/docker-compose.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.3
+# Version: 1.1.4
 
 version: "2"
 
@@ -25,8 +25,8 @@ services:
       REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
-      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
       AWS_BUCKET: ${AWS_BUCKET}
       MOCHA_GREP: ${MOCHA_GREP}
     user: node
diff --git a/services/track-changes/package.json b/services/track-changes/package.json
index b8781ed635..006a3b78a9 100644
--- a/services/track-changes/package.json
+++ b/services/track-changes/package.json
@@ -11,7 +11,7 @@
     "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
     "test:acceptance:_run": "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY AWS_BUCKET=$AWS_BUCKET AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
-    "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
+    "test:unit:_run": "mocha --recursive --reporter spec --exit $@ test/unit/js",
     "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "compile:unit_tests": "[ ! -e test/unit/coffee ] &&  echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee",
     "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee",