From 0b41d32cbbf783bb58bcfeddcd17507c9336c16d Mon Sep 17 00:00:00 2001
From: Joe Green <joe.green0991@gmail.com>
Date: Thu, 21 Sep 2017 10:59:41 +0100
Subject: [PATCH 1/2] Update Jenkinsfile

---
 services/real-time/Jenkinsfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/real-time/Jenkinsfile b/services/real-time/Jenkinsfile
index 81456dee00..f5f121ecf3 100644
--- a/services/real-time/Jenkinsfile
+++ b/services/real-time/Jenkinsfile
@@ -35,6 +35,7 @@ pipeline {
     stage('Compile') {
       steps {
         sh 'node_modules/.bin/grunt install'
+        sh 'node_modules/.bin/grunt compile:acceptance_tests'
       }
     }
     stage('Test') {
@@ -42,6 +43,12 @@ pipeline {
         sh 'node_modules/.bin/grunt test:unit'
       }
     }
+    stage('Acceptance Tests') {
+      steps {
+        sh 'docker pull sharelatex/acceptance-test-runner'
+        sh 'docker run --rm -v $(pwd):/app sharelatex/acceptance-test-runner'
+      }
+    }
     stage('Package') {
       steps {
         sh 'echo ${BUILD_NUMBER} > build_number.txt'

From dc8f4ffc2a48ef2309f44af2a788dd2c1468d4c2 Mon Sep 17 00:00:00 2001
From: Joe Green <joe.green0991@gmail.com>
Date: Thu, 21 Sep 2017 11:03:07 +0100
Subject: [PATCH 2/2] Update Jenkinsfile

---
 services/real-time/Jenkinsfile | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/services/real-time/Jenkinsfile b/services/real-time/Jenkinsfile
index f5f121ecf3..b684c49eb0 100644
--- a/services/real-time/Jenkinsfile
+++ b/services/real-time/Jenkinsfile
@@ -1,11 +1,6 @@
 pipeline {
   
-  agent {
-    docker {
-      image 'node:4.2.1'
-      args "-v /var/lib/jenkins/.npm:/tmp/.npm"
-    }
-  }
+  agent any
 
   environment  {
       HOME = "/tmp"
@@ -17,29 +12,35 @@ pipeline {
   }
 
   stages {
-    stage('Set up') {
+    stage('Install') {
+      agent {
+        docker {
+          image 'node:4.2.1'
+          args "-v /var/lib/jenkins/.npm:/tmp/.npm -e HOME=/tmp"
+          reuseNode true
+        }
+      }
       steps {
         // we need to disable logallrefupdates, else git clones during the npm install will require git to lookup the user id
         // which does not exist in the container's /etc/passwd file, causing the clone to fail.
         sh 'git config --global core.logallrefupdates false'
-      }
-    }
-    stage('Install') {
-      steps {
         sh 'rm -fr node_modules'
         sh 'npm install'
         sh 'npm rebuild'
         sh 'npm install --quiet grunt-cli'
       }
     }
-    stage('Compile') {
+    stage('Compile and Test') {
+      agent {
+        docker {
+          image 'node:4.2.1'
+          args "-v /var/lib/jenkins/.npm:/tmp/.npm -e HOME=/tmp"
+          reuseNode true
+        }
+      }
       steps {
         sh 'node_modules/.bin/grunt install'
         sh 'node_modules/.bin/grunt compile:acceptance_tests'
-      }
-    }
-    stage('Test') {
-      steps {
         sh 'node_modules/.bin/grunt test:unit'
       }
     }