From e62d5b31a53dc4d59c0b8ca823223ef38d4b73af Mon Sep 17 00:00:00 2001
From: Chuey Anima <canima@yahoo.com>
Date: Thu, 12 Apr 2018 23:06:56 -0700
Subject: [PATCH 1/3] Add initial Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..4ef14006d9
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,10 @@
+pipeline {
+    agent { docker { image 'node:6.3' } }
+    stages {
+        stage('build') {
+            steps {
+                sh 'npm --version'
+            }
+        }
+    }
+}
\ No newline at end of file

From 118b894d2afb2d03c8857cb329781d9bb27e6431 Mon Sep 17 00:00:00 2001
From: Chuey Anima <canima@yahoo.com>
Date: Fri, 13 Apr 2018 07:58:20 -0700
Subject: [PATCH 2/3] 2nd commit

---
 Jenkinsfile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4ef14006d9..14f0b741ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,15 @@
 pipeline {
-    agent { docker { image 'node:6.3' } }
+    agent {
+        docker {
+            image 'node:6-alpine' 
+            args '-p 3000:3000' 
+        }
+    }
     stages {
-        stage('build') {
+        stage('Build') { 
             steps {
-                sh 'npm --version'
+                sh 'npm install' 
             }
         }
     }
-}
\ No newline at end of file
+}

From f1c1e014e7bd5db44e953c671f1a88a6b833e29e Mon Sep 17 00:00:00 2001
From: Chuey Anima <canima@yahoo.com>
Date: Sun, 15 Apr 2018 10:14:56 -0700
Subject: [PATCH 3/3] updated Jenkinsfile

---
 Jenkinsfile         | 23 +++++++++++++++++++----
 jenkins/Jenkinsfile | 30 ------------------------------
 2 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 jenkins/Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 14f0b741ab..cf6ea71f5a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,14 +1,29 @@
 pipeline {
     agent {
         docker {
-            image 'node:6-alpine' 
-            args '-p 3000:3000' 
+            image 'node:6-alpine'
+            args '-p 3000:3000'
         }
     }
+    environment {
+        CI = 'true'
+    }
     stages {
-        stage('Build') { 
+        stage('Build') {
+            steps {
+                sh 'npm install'
+            }
+        }
+        stage('Test') {
+            steps {
+                sh './jenkins/scripts/test.sh'
+            }
+        }
+        stage('Deliver') {
             steps {
-                sh 'npm install' 
+                sh './jenkins/scripts/deliver.sh'
+                input message: 'Finished using the web site? (Click "Proceed" to continue)'
+                sh './jenkins/scripts/kill.sh'
             }
         }
     }
diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
deleted file mode 100644
index cf6ea71f5a..0000000000
--- a/jenkins/Jenkinsfile
+++ /dev/null
@@ -1,30 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            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'
-            }
-        }
-        stage('Deliver') {
-            steps {
-                sh './jenkins/scripts/deliver.sh'
-                input message: 'Finished using the web site? (Click "Proceed" to continue)'
-                sh './jenkins/scripts/kill.sh'
-            }
-        }
-    }
-}