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