From bcf3f4b07f0dc5e9c2ca70b4c91461de8693d9fc Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Thu, 21 Dec 2017 23:05:28 +0000
Subject: [PATCH 1/8] Adding jenkins file

---
 Jenkinsfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..54217ba916
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,15 @@
+pipeline {
+    agent {
+        docker {
+            image 'node:6-alpine'
+            args '-p 3000:3000'
+        }
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'npm install'
+            }
+        }
+    }
+}
\ No newline at end of file

From d6b06f87628aab5f8ffb884bed6831b4a4089abb Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 00:36:18 +0000
Subject: [PATCH 2/8] Adding test and deliver directives

---
 Jenkinsfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54217ba916..132f26d360 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,5 +11,17 @@ pipeline {
                 sh 'npm install'
             }
         }
+        stage('Test') {
+            steps {
+                sh './jenkins/scripts/test.sh'
+            }
+        }
+        stage('Deliver') {
+            steps {
+                sh './jenkins/scripts/deliver.sh'
+                input message: 'Finished using the web site? (Click "Proceed" to continue)'
+                sh './jenkins/scripts/kill.sh'
+            }
+        }
     }
 }
\ No newline at end of file

From 9d0f8ee39de81da638ed412997e344d582595b52 Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 00:41:17 +0000
Subject: [PATCH 3/8] lock package versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 53720bdbbb..956c69a5fc 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
+    "react": "16.0.0",
+    "react-dom": "16.0.0",
     "react-scripts": "1.0.14"
   },
   "scripts": {

From d385d7f1d93b33509170f67a45c37c904eeec2b1 Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 01:07:21 +0000
Subject: [PATCH 4/8] downgrade react to remove error

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 956c69a5fc..7925ca561b 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "react": "16.0.0",
-    "react-dom": "16.0.0",
+    "react": "15.6.2",
+    "react-dom": "15.6.2",
     "react-scripts": "1.0.14"
   },
   "scripts": {
@@ -13,4 +13,4 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
-}
\ No newline at end of file
+}

From 6d1e94a610ba860686a5f3023b3531eba003782b Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 01:10:58 +0000
Subject: [PATCH 5/8] quit test after running

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 132f26d360..5e4ee3eae7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,6 +14,7 @@ pipeline {
         stage('Test') {
             steps {
                 sh './jenkins/scripts/test.sh'
+                sh 'q'
             }
         }
         stage('Deliver') {

From e1e3db143a24d4c26f571f0359bec298c045cfa4 Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 01:13:54 +0000
Subject: [PATCH 6/8] quit test after running

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7925ca561b..c8e386bee9 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
+    "test": "react-scripts test --env=jsdom --bail",
     "eject": "react-scripts eject"
   }
 }

From d8dd581c7aaeb0577e2720979055d6f137873a9d Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 01:16:38 +0000
Subject: [PATCH 7/8] quit test after running

---
 Jenkinsfile  | 4 +++-
 package.json | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5e4ee3eae7..8d7c17679d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,9 @@ pipeline {
             image 'node:6-alpine'
             args '-p 3000:3000'
         }
+        environment {
+                CI = 'true'
+        }
     }
     stages {
         stage('Build') {
@@ -14,7 +17,6 @@ pipeline {
         stage('Test') {
             steps {
                 sh './jenkins/scripts/test.sh'
-                sh 'q'
             }
         }
         stage('Deliver') {
diff --git a/package.json b/package.json
index c8e386bee9..7925ca561b 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom --bail",
+    "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
 }

From 010a8a826dbd2925e6aab9bc56f251bd0f8c1e26 Mon Sep 17 00:00:00 2001
From: colin clark <colin.clark@prudential.co.uk>
Date: Fri, 22 Dec 2017 01:19:45 +0000
Subject: [PATCH 8/8] quit test after running

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8d7c17679d..a47a2f7955 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
             image 'node:6-alpine'
             args '-p 3000:3000'
         }
-        environment {
-                CI = 'true'
-        }
+    }
+    environment {
+            CI = 'true'
     }
     stages {
         stage('Build') {