From 0630142cff07b8680ceb72407ad0502575685772 Mon Sep 17 00:00:00 2001 From: Marcelo Ferreira Date: Sat, 24 Feb 2018 12:48:03 -0300 Subject: [PATCH 1/4] jenkins script added --- Jenkinsfile | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..54217ba916 --- /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' + } + } + } +} \ No newline at end of file diff --git a/package.json b/package.json index 53720bdbbb..9429268ca0 100644 --- a/package.json +++ b/package.json @@ -13,4 +13,4 @@ "test": "react-scripts test --env=jsdom", "eject": "react-scripts eject" } -} \ No newline at end of file +} From bb5cc28632005490297de012af16ec5f2984b995 Mon Sep 17 00:00:00 2001 From: Marcelo Ferreira Date: Sat, 24 Feb 2018 13:50:38 -0300 Subject: [PATCH 2/4] jenkins script added - no docker image --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 54217ba916..af7bd2a7aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } - } + agent any stages { stage('Build') { steps { From 5b7350138c4c40d5f5c5fee1364acebd69ffa2ae Mon Sep 17 00:00:00 2001 From: Marcelo Ferreira Date: Sat, 24 Feb 2018 14:06:39 -0300 Subject: [PATCH 3/4] test stage added --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index af7bd2a7aa..196b4f2395 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,18 @@ pipeline { agent any + environment { + CI = 'true' + } stages { stage('Build') { steps { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } } } \ No newline at end of file From dc7ae81813637e48520cca4310c1bd25dfd84261 Mon Sep 17 00:00:00 2001 From: Marcelo Ferreira Date: Sat, 24 Feb 2018 14:14:14 -0300 Subject: [PATCH 4/4] delivery stage added --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 196b4f2395..4c49adfcd8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,5 +14,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