From ecac32ef6716be0f55845da450a05233eafad52e Mon Sep 17 00:00:00 2001 From: Pawel Polakiewicz Date: Tue, 29 May 2018 14:28:37 +0200 Subject: [PATCH 1/4] Add first build stage --- jenkins/Jenkinsfile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..4a54eefb4a 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -5,26 +5,11 @@ pipeline { args '-p 3000:3000' } } - environment { - CI = 'true' - } stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' - } - } - stage('Deliver') { + stage('Build'){ steps { - sh './jenkins/scripts/deliver.sh' - input message: 'Finished using the web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' + sh "npm install" } } } -} +} \ No newline at end of file From 2ab18cc14c3fd07753a1d59b1d28d1788d3830d1 Mon Sep 17 00:00:00 2001 From: Pawel Polakiewicz Date: Tue, 29 May 2018 14:43:53 +0200 Subject: [PATCH 2/4] move jenkinsfile to main folder --- jenkins/Jenkinsfile => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkins/Jenkinsfile => Jenkinsfile (100%) diff --git a/jenkins/Jenkinsfile b/Jenkinsfile similarity index 100% rename from jenkins/Jenkinsfile rename to Jenkinsfile From 56ed7ed17a33115f38e22b8e7fc8111ee99b884c Mon Sep 17 00:00:00 2001 From: Pawel Polakiewicz Date: Tue, 29 May 2018 15:10:14 +0200 Subject: [PATCH 3/4] Add 'Test' stage --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4a54eefb4a..de6a20b203 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,10 +5,18 @@ pipeline { args '-p 3000:3000' } } + environment { + CI = 'true' + } stages { - stage('Build'){ + stage('Build') { + steps { + sh 'npm install' + } + } + stage('Test') { steps { - sh "npm install" + sh './jenkins/scripts/test.sh' } } } From 7a1916e3616d476c07a2577d38f000e767c7bd01 Mon Sep 17 00:00:00 2001 From: Pawel Polakiewicz Date: Tue, 29 May 2018 15:43:44 +0200 Subject: [PATCH 4/4] Add 'Deliver' stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index de6a20b203..83202a8b0c 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' + } + } } } \ No newline at end of file