From d63c04334090ab49346ccb43edde9c1c9a544720 Mon Sep 17 00:00:00 2001 From: Florentin Sardan Date: Tue, 7 Nov 2017 23:27:01 +0200 Subject: [PATCH 1/3] new jenkins file --- Jenkinsfile | 15 +++++++++++++++ Jenkinsfile~ | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 Jenkinsfile create mode 100644 Jenkinsfile~ diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..14f0b741ab --- /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' + } + } + } +} diff --git a/Jenkinsfile~ b/Jenkinsfile~ new file mode 100644 index 0000000000..14f0b741ab --- /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' + } + } + } +} From f880852c36237401ad33b9c055b54b8bbee7c25c Mon Sep 17 00:00:00 2001 From: Florentin Sardan Date: Wed, 8 Nov 2017 00:02:00 +0200 Subject: [PATCH 2/3] test stage --- Jenkinsfile | 9 +++++++++ Jenkinsfile~ | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 14f0b741ab..4b47950720 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,9 @@ pipeline { image 'node:6-alpine' args '-p 3000:3000' } + } + environment { + CI = 'true' } stages { stage('Build') { @@ -11,5 +14,11 @@ pipeline { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } + } } diff --git a/Jenkinsfile~ b/Jenkinsfile~ index 14f0b741ab..4b47950720 100644 --- a/Jenkinsfile~ +++ b/Jenkinsfile~ @@ -4,6 +4,9 @@ pipeline { image 'node:6-alpine' args '-p 3000:3000' } + } + environment { + CI = 'true' } stages { stage('Build') { @@ -11,5 +14,11 @@ pipeline { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } + } } From 384c06eee802f68a036c64b1f0f065ef706f8080 Mon Sep 17 00:00:00 2001 From: Florentin Sardan Date: Wed, 8 Nov 2017 00:05:38 +0200 Subject: [PATCH 3/3] deliver --- Jenkinsfile | 8 +++++++- Jenkinsfile~ | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4b47950720..a591c376f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +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' + } + } } } diff --git a/Jenkinsfile~ b/Jenkinsfile~ index 4b47950720..a591c376f4 100644 --- a/Jenkinsfile~ +++ b/Jenkinsfile~ @@ -19,6 +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' + } + } } }