From b7aa5501e37dccca1d238b915ff31f9f96a97969 Mon Sep 17 00:00:00 2001 From: hafl1016 Date: Tue, 20 Nov 2018 20:33:20 +0100 Subject: [PATCH 1/5] push --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..6a2625ba88 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' + } + } + stages { + stage('Build') { + steps { + sh 'npm install' + } + } + } +}S \ No newline at end of file From ec11036b30f2d9ed135f6985f3c48dd887f48a6c Mon Sep 17 00:00:00 2001 From: hafl1016 Date: Tue, 20 Nov 2018 20:38:42 +0100 Subject: [PATCH 2/5] upload2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a2625ba88..2b6476817e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,4 +12,4 @@ pipeline { } } } -}S \ No newline at end of file +} \ No newline at end of file From 1435c4329f3469edaef78257216d4c4aa0a9d993 Mon Sep 17 00:00:00 2001 From: hafl1016 Date: Tue, 20 Nov 2018 20:42:38 +0100 Subject: [PATCH 3/5] added test stage --- Jenkinsfile | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b6476817e..cf6ea71f5a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,30 @@ pipeline { agent { docker { - image 'node:6-alpine' - args '-p 3000:3000' + image 'node:6-alpine' + args '-p 3000:3000' } } + environment { + CI = 'true' + } stages { - stage('Build') { + stage('Build') { + steps { + sh 'npm install' + } + } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } + stage('Deliver') { steps { - sh 'npm install' + 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 ee51ee7c12c28fb6cf33a41014cb702912765956 Mon Sep 17 00:00:00 2001 From: hafl1016 Date: Tue, 20 Nov 2018 20:43:10 +0100 Subject: [PATCH 4/5] removed deliver stage --- Jenkinsfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cf6ea71f5a..42f1d15697 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,12 +19,5 @@ 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 9e4cfe2e83f3ba78c8046999eab3aa96d8604ac9 Mon Sep 17 00:00:00 2001 From: hafl1016 Date: Tue, 20 Nov 2018 20:54:52 +0100 Subject: [PATCH 5/5] add delivery stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 42f1d15697..cf6ea71f5a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,5 +19,12 @@ 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' + } + } } }