From 3eef89e849530811b89ba42c0a04b67f91ed2979 Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Sun, 13 Oct 2019 23:27:14 +0100
Subject: [PATCH 1/7] initial jenkinsfile

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

diff --git a/jenkinsfile b/jenkinsfile
new file mode 100644
index 0000000000..4362308fe2
--- /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 bb2a5fa2f717bd68fc3eaf430b033afb37e2671a Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Sun, 13 Oct 2019 23:39:24 +0100
Subject: [PATCH 2/7] updating jenkins file

---
 jenkinsfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 4362308fe2..441284b5d8 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,15 +1,15 @@
 pipeline {
-  agent {
-    docker {
-      image: 'node:6-alpine'
-      args: '-p 3000:3000'
+    agent {
+        docker {
+            image 'node:6-alpine'
+            args '-p 3000:3000'
+        }
+    }   
+    stages {
+        stage('Build') {
+            steps {
+                sh 'npm install'
+            }
+        }
     }
-  }
-  stages {
-    stage{'Build'} {
-      steps {
-        sh 'npm install'
-      }
-    }
-  }
-}
\ No newline at end of file
+}

From d9f190847905da075f7124af6676401902a247a4 Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Sun, 13 Oct 2019 23:59:06 +0100
Subject: [PATCH 3/7] terst

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 441284b5d8..75e9fb22b5 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -12,4 +12,4 @@ pipeline {
             }
         }
     }
-}
+}
\ No newline at end of file

From ef05428adbad32f8e6ace6c48d4dd007582b55b4 Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Mon, 14 Oct 2019 00:13:44 +0100
Subject: [PATCH 4/7] removing jenkinsfile to readd

---
 jenkinsfile | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 jenkinsfile

diff --git a/jenkinsfile b/jenkinsfile
deleted file mode 100644
index 75e9fb22b5..0000000000
--- a/jenkinsfile
+++ /dev/null
@@ -1,15 +0,0 @@
-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 5abeb03ab761e9b9469e4f7e99f73654774972f6 Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Mon, 14 Oct 2019 00:14:42 +0100
Subject: [PATCH 5/7] readding file

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

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..75e9fb22b5
--- /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 07ea045745afd32e590a69a51a406b9a0ddf07ed Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Mon, 14 Oct 2019 00:20:01 +0100
Subject: [PATCH 6/7] adding a test stage in Jenkinsfile

---
 Jenkinsfile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 75e9fb22b5..900046e13b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,12 +4,20 @@ pipeline {
             image 'node:6-alpine'
             args '-p 3000:3000'
         }
-    }   
+    }
+    environment {
+      CI = 'true'
+    }
     stages {
         stage('Build') {
             steps {
                 sh 'npm install'
             }
         }
+        stage('Test') {
+          steps {
+            sh './jenkins/scripts/test.sh'
+          }
+        }
     }
 }
\ No newline at end of file

From 9781b3167d465a37c281a9f8dd1aacec70e16c45 Mon Sep 17 00:00:00 2001
From: Darren McPherson <dmcp@macbook-pro.home>
Date: Mon, 14 Oct 2019 00:23:38 +0100
Subject: [PATCH 7/7] adding delivery stage

---
 Jenkinsfile | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 900046e13b..9989b02b83 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,15 +9,22 @@ pipeline {
       CI = 'true'
     }
     stages {
-        stage('Build') {
-            steps {
-                sh 'npm install'
-            }
-        }
-        stage('Test') {
+      stage('Build') {
           steps {
-            sh './jenkins/scripts/test.sh'
+              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