From 323864474797bcf982767ff5e2d40bd6d625b07e Mon Sep 17 00:00:00 2001 From: Daniel Berman Date: Mon, 27 Nov 2017 13:26:18 +0200 Subject: [PATCH 1/4] Create Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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' + } + } + } +} From 4c6be28bf24842d54c77f78a81f671d3b33eea13 Mon Sep 17 00:00:00 2001 From: Daniel Berman Date: Mon, 27 Nov 2017 13:40:06 +0200 Subject: [PATCH 2/4] Update Jenkinsfile --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 14f0b741ab..97f55392bb 100644 --- a/Jenkinsfile +++ b/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' + } + } } } From 515407d35db5e6a513dac7bf31d00e57ab62299d Mon Sep 17 00:00:00 2001 From: Daniel Berman Date: Mon, 27 Nov 2017 13:41:46 +0200 Subject: [PATCH 3/4] Update Jenkinsfile --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 97f55392bb..7f63406066 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' + } + } } } From bb8fb33e82d67e69e3a29a95ba9982d3ab1333fe Mon Sep 17 00:00:00 2001 From: Daniel Berman Date: Mon, 27 Nov 2017 13:46:05 +0200 Subject: [PATCH 4/4] Update App.js --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 203067e4d7..ab4556d605 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ class App extends Component {
logo -

Welcome to React

+

Welcome to your new cool app!

To get started, edit src/App.js and save to reload.