From 24b7473dffd0710d50342aea40a4c42ab73e0b40 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 08:42:47 -0600 Subject: [PATCH 1/7] reset jenkinsfile to beginning of tutorial --- jenkins/Jenkinsfile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..c8bfa55cc9 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -5,26 +5,12 @@ pipeline { 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' - } - } } } From d5889b1174fe7a5ad560dae8b78860ee52ef8c27 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:00:41 -0600 Subject: [PATCH 2/7] Moved file out of jenkins folder to root --- jenkins/Jenkinsfile => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkins/Jenkinsfile => Jenkinsfile (100%) diff --git a/jenkins/Jenkinsfile b/Jenkinsfile similarity index 100% rename from jenkins/Jenkinsfile rename to Jenkinsfile From c5fd4f89eba34a53fe75c36f19504f3b780303a0 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:26:40 -0600 Subject: [PATCH 3/7] Try to fix build issue --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8bfa55cc9..1ba25e0fc9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,12 @@ pipeline { agent { docker { - image 'node:6-alpine' + image 'node:8.12.0' args '-p 3000:3000' } + environment { + HOME = '.' } - stages { stage('Build') { steps { From 73ce69e36aa5d8ed5845288a9734a1a5ca4d057a Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:28:23 -0600 Subject: [PATCH 4/7] syntax error --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1ba25e0fc9..0e0574c59e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { } environment { HOME = '.' + } } stages { stage('Build') { From 9b0089c8a77f745424ba841ebae04a3e27be97b8 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:39:17 -0600 Subject: [PATCH 5/7] syntax error --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e0574c59e..f52896534d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,12 +1,12 @@ pipeline { agent { docker { - image 'node:8.12.0' + image 'node:6-alpine' args '-p 3000:3000' } - environment { - HOME = '.' - } + } + environment { + HOME = '.' } stages { stage('Build') { From 921edfc0e857ec4b30f8eb5f085ba0919bb3a3c3 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:47:39 -0600 Subject: [PATCH 6/7] jenkinsfile --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index f52896534d..c83f715f64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,7 @@ pipeline { } environment { HOME = '.' + CI = 'true' } stages { stage('Build') { @@ -14,5 +15,11 @@ pipeline { sh 'npm install' } } + + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } } } From b1e45e8c447872a1b959d875e044a396cf220bf0 Mon Sep 17 00:00:00 2001 From: Fee Chin Date: Mon, 11 Mar 2019 09:50:16 -0600 Subject: [PATCH 7/7] jenkinsfile --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c83f715f64..9231fdd25b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,5 +21,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' + } + } } }