From dde33d61906a6894ebead62e48368d94eda44e3e Mon Sep 17 00:00:00 2001
From: Raymond Wong <raymond.wong@suppliergateway.com>
Date: Sat, 17 Aug 2024 13:03:53 -0700
Subject: [PATCH 1/4] 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..a0caf31db1
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,10 @@
+pipeline {
+    agent any
+    stages {
+        stage('Build') { 
+            steps {
+                sh 'npm install' 
+            }
+        }
+    }
+}
\ No newline at end of file

From 80b0c6e9000fec549f03195070e81039e9921995 Mon Sep 17 00:00:00 2001
From: Raymond Wong <raymond.wong@suppliergateway.com>
Date: Sat, 17 Aug 2024 15:06:22 -0700
Subject: [PATCH 2/4] Add 'Test' stage

---
 Jenkinsfile | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a0caf31db1..8a8a7f6266 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,28 @@
 pipeline {
     agent any
     stages {
+        stage('Clean') {
+            steps {
+                deleteDir()
+            }
+        }
+        stage("Clone Repo") {
+            steps {
+                sh "git clone https://github.com/rwmuteki/simple-node-js-react-npm-app.git"
+            }
+        }
         stage('Build') { 
             steps {
-                sh 'npm install' 
+                dir("simple-node-js-react-npm-app") {
+                    sh "npm install"
+                }
+            }
+        }
+        stage('Test') {
+            steps {
+                dir("simple-node-js-react-npm-app") {
+                    sh './jenkins/scripts/test.sh'
+                }
             }
         }
     }

From 73855ecf5f581b57c584a4801409af3f622132da Mon Sep 17 00:00:00 2001
From: Raymond Wong <raymond.wong@suppliergateway.com>
Date: Sat, 17 Aug 2024 15:12:13 -0700
Subject: [PATCH 3/4] Add 'Deliver' stage

---
 Jenkinsfile | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8a8a7f6266..898be6e544 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,24 +5,17 @@ pipeline {
             steps {
                 deleteDir()
             }
-        }
-        stage("Clone Repo") {
-            steps {
-                sh "git clone https://github.com/rwmuteki/simple-node-js-react-npm-app.git"
-            }
-        }
-        stage('Build') { 
-            steps {
-                dir("simple-node-js-react-npm-app") {
-                    sh "npm install"
-                }
+        }        
+        stage('Test') {
+            steps {              
+                sh './jenkins/scripts/test.sh'                
             }
         }
-        stage('Test') {
+        stage('Deliver') {
             steps {
-                dir("simple-node-js-react-npm-app") {
-                    sh './jenkins/scripts/test.sh'
-                }
+                sh './jenkins/scripts/deliver.sh'
+                input message: 'Finished using the web site? (Click "Proceed" to continue)'
+                sh './jenkins/scripts/kill.sh'
             }
         }
     }

From 1676df8dff68f5c2962959883132f37cd3354f26 Mon Sep 17 00:00:00 2001
From: Raymond Wong <raymond.wong@suppliergateway.com>
Date: Sat, 17 Aug 2024 15:15:28 -0700
Subject: [PATCH 4/4] Cleaned up stage

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 898be6e544..bcce044b12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,11 @@
 pipeline {
     agent any
     stages {
-        stage('Clean') {
-            steps {
-                deleteDir()
+        stage('Build') { 
+            steps {                
+                sh "npm install"                
             }
-        }        
+        }
         stage('Test') {
             steps {              
                 sh './jenkins/scripts/test.sh'