From b64b2ba8284e05c36a30acec484849a842eaec31 Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 11:05:29 +1000 Subject: [PATCH 01/11] git commit -m "Add initial Jenkinsfile" --- jenkins/Jenkinsfile | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..af6334f5fd 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,30 +1,15 @@ -pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } +pipeline{ + agent{ + docker{ + image 'node:6-alpine' + args 'p 3000:3000' } - environment { - CI = 'true' } - stages { - stage('Build') { - steps { + 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' - } - } } -} +} \ No newline at end of file From 4c8b7e30701ebc321a3b3d1a840ac8ee4a1c1a3c Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 11:07:05 +1000 Subject: [PATCH 02/11] "Updated Jenkins Build script" --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index af6334f5fd..07e66f646d 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -6,7 +6,7 @@ pipeline{ } } stages{ - stage('build'){ + stage('Build'){ steps{ sh 'npm install' } From 8de276209a827fce228f6de9dda6d8ed0242ba71 Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 11:43:33 +1000 Subject: [PATCH 03/11] "Add initial Jenkinsfile" --- jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/scripts/test.sh b/jenkins/scripts/test.sh index 360d00b94e..050114eb08 100755 --- a/jenkins/scripts/test.sh +++ b/jenkins/scripts/test.sh @@ -2,7 +2,7 @@ echo 'The following "npm" command (if executed) installs the "cross-env"' echo 'dependency into the local "node_modules" directory, which will ultimately' -echo 'be stored in the Jenkins home directory. As described in' +echo 'be stored in the Jenkinsfile home directory. As described in' echo 'https://docs.npmjs.com/cli/install,%20the"--save-dev" flag causes the' echo '"cross-env" dependency to be installed as "devDependencies". For the' echo 'purposes of this tutorial, this flag is not important. However, when' From b46f41dfd43b81fc5bdd07e1bcd8ef6d2c492722 Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 11:49:31 +1000 Subject: [PATCH 04/11] modified --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 07e66f646d..445cc3d1b1 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,7 +1,7 @@ pipeline{ agent{ docker{ - image 'node:6-alpine' + image 'node:9.8.0-alpine' args 'p 3000:3000' } } From 4ed09752ed09451d631028b0cd7df8a1d2c99eb1 Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 11:58:17 +1000 Subject: [PATCH 05/11] modified --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 445cc3d1b1..e3c46f09f3 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,7 +1,7 @@ pipeline{ agent{ docker{ - image 'node:9.8.0-alpine' + image 'node:9.11.1-alpine' args 'p 3000:3000' } } From e80106264b4c75c1ef935b4d0771a7a6333a371f Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:03:45 +1000 Subject: [PATCH 06/11] modified to node 6 --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index e3c46f09f3..3e59bdd586 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,7 +1,7 @@ pipeline{ agent{ docker{ - image 'node:9.11.1-alpine' + image 'node:6' args 'p 3000:3000' } } From 64cec822a7c6d17b4ea4495549f592303399ce2c Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:08:13 +1000 Subject: [PATCH 07/11] modified to node 6 --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 3e59bdd586..0f1eb1dffd 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,7 +1,7 @@ pipeline{ agent{ docker{ - image 'node:6' + image 'node:latest' args 'p 3000:3000' } } From 90be0da5fc663ac35e3fefb39f8251824c499925 Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:12:25 +1000 Subject: [PATCH 08/11] fixed docker params --- jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 0f1eb1dffd..1c268459e2 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,8 +1,8 @@ pipeline{ agent{ docker{ - image 'node:latest' - args 'p 3000:3000' + image 'node:6-alpine' + args '-p 3000:3000' } } stages{ From 4046e427b07ee9a0b8cc5fbaf197063d67a6fb2b Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:17:32 +1000 Subject: [PATCH 09/11] added test stage to build script --- jenkins/Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 1c268459e2..e46bec67da 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -5,11 +5,19 @@ pipeline{ 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 d7eec634b0ca5aeda710d6f9d4750d426f47973b Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:21:21 +1000 Subject: [PATCH 10/11] added delivery stage to build script --- jenkins/Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index e46bec67da..6b978f43b9 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -19,5 +19,12 @@ pipeline{ sh './jenkins/scripts/test.sh' } } + stage('Deliver'){ + steps{ + sh './jenkins/scripts/deliver.sh' + input message 'Finished using the website? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } \ No newline at end of file From caeccb3e6ae208f437e0bed20216ee58dbd5a6fc Mon Sep 17 00:00:00 2001 From: Russell Milburn Date: Tue, 8 May 2018 12:22:20 +1000 Subject: [PATCH 11/11] added delivery stage to build script --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 6b978f43b9..a9220b99f2 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -22,7 +22,7 @@ pipeline{ stage('Deliver'){ steps{ sh './jenkins/scripts/deliver.sh' - input message 'Finished using the website? (Click "Proceed" to continue)' + input message: 'Finished using the website? (Click "Proceed" to continue)' sh './jenkins/scripts/kill.sh' } }