From e358314c5204638b1fd82a71c9835cd223bf39ca Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 10:51:33 +0700
Subject: [PATCH 1/6] Add init Jenkinsfile

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

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

From b0b99bd4049eab43270dfd26451657f787e8feba Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 10:59:37 +0700
Subject: [PATCH 2/6] update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index cc3b73d155..9a76a7eb56 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
   agent {
     docker {
-      image: 'node:6-alpine'
-      args: '-p 3000:3000'
+      image 'node:6-alpine'
+      args '-p 3000:3000'
     }
   }
 

From 1618be6cbb13c916fc02393b084d93366b8f9c13 Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 11:12:31 +0700
Subject: [PATCH 3/6] Add 'Test' stage

---
 Jenkinsfile             | 10 ++++++++++
 jenkins/scripts/test.sh |  2 +-
 package.json            |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9a76a7eb56..ae7c4ff441 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,10 @@ pipeline {
       image 'node:6-alpine'
       args '-p 3000:3000'
     }
+
+    environment {
+      CI = 'true'
+    }
   }
 
   stages {
@@ -12,5 +16,11 @@ pipeline {
         sh 'npm install'
       }
     }
+
+    stage('Test') {
+      steps {
+        sh './jenkins/scripts/test.sh'
+      }
+    }
   }
 }
diff --git a/jenkins/scripts/test.sh b/jenkins/scripts/test.sh
index 360d00b94e..6789ebcef0 100755
--- a/jenkins/scripts/test.sh
+++ b/jenkins/scripts/test.sh
@@ -10,7 +10,7 @@ echo 'installing this dependency, it would typically be done so using this'
 echo 'flag. For a comprehensive explanation about "devDependencies", see'
 echo 'https://stackoverflow.com/questions/18875674/whats-the-difference-between-dependencies-devdependencies-and-peerdependencies.'
 set -x
-# npm install --save-dev cross-env
+npm install --save-dev cross-env
 set +x
 
 echo 'The following "npm" command tests that your simple Node.js/React'
diff --git a/package.json b/package.json
index 53720bdbbb..6368a0ce41 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": "cross-env CI=true react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
-}
\ No newline at end of file
+}

From 007bf55bd165e0712845c30b22456b9d6c5a67c7 Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 11:15:44 +0700
Subject: [PATCH 4/6] Fix bug evironment

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

diff --git a/Jenkinsfile b/Jenkinsfile
index ae7c4ff441..4c5668cde5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,11 +3,11 @@ pipeline {
     docker {
       image 'node:6-alpine'
       args '-p 3000:3000'
-    }
+    } 
+  }
 
-    environment {
-      CI = 'true'
-    }
+  environment {
+    CI = 'true'
   }
 
   stages {

From 9277d046d230e4c8fba7b7ac3921e65aa24f3de7 Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 11:26:10 +0700
Subject: [PATCH 5/6] Add 'Deliver' stage

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 4c5668cde5..b0c147fee8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,5 +22,13 @@ pipeline {
         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'
+      }
+    }
   }
 }

From 857acb742e28784d1e0e1291c63a9b719a6d3ddb Mon Sep 17 00:00:00 2001
From: Van Nguyen <hoangvan87@gmail.com>
Date: Thu, 10 Jan 2019 16:11:31 +0700
Subject: [PATCH 6/6] change content app

---
 src/App.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.js b/src/App.js
index 203067e4d7..215e485d66 100644
--- a/src/App.js
+++ b/src/App.js
@@ -12,6 +12,7 @@ class App extends Component {
         </header>
         <p className="App-intro">
           To get started, edit <code>src/App.js</code> and save to reload.
+          The new content
         </p>
       </div>
     );