From ba461c2d3287e86e616a55f76ade06331ddebe8c Mon Sep 17 00:00:00 2001 From: wolske Date: Thu, 11 Jul 2019 20:18:39 -0400 Subject: [PATCH 1/6] 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..bb03a9e0e5 --- /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 4fab5e1782245020ed9c87f3ab3fc35d44e039c4 Mon Sep 17 00:00:00 2001 From: wolske Date: Thu, 11 Jul 2019 23:52:07 -0400 Subject: [PATCH 2/6] Updated Jenkinsfile with Environment and Test Stage --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bb03a9e0e5..e4318882d2 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 99c87d655a6891a8666af72b2f53739cb8578814 Mon Sep 17 00:00:00 2001 From: wolske Date: Thu, 11 Jul 2019 23:55:46 -0400 Subject: [PATCH 3/6] Added 'Deliver' stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e4318882d2..8101fabdb4 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 web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } From c83d82174cb2bf7040c9bd54d2c2b3a7e2e489c6 Mon Sep 17 00:00:00 2001 From: wolske Date: Fri, 12 Jul 2019 00:08:33 -0400 Subject: [PATCH 4/6] Back to Test stage --- Jenkinsfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8101fabdb4..e4318882d2 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 web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' - } - } } } From 8e1b8d9c98a192f202f5ab5f996737433608d5b2 Mon Sep 17 00:00:00 2001 From: wolske Date: Fri, 12 Jul 2019 00:11:54 -0400 Subject: [PATCH 5/6] re-added Deliver stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e4318882d2..345cb12c58 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,13 @@ pipeline { steps { sh './jenkins/scripts/test.sh' } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } } From de39a4ebcdd94194b18fceb089bb5f4cbb3437fe Mon Sep 17 00:00:00 2001 From: wolske Date: Fri, 12 Jul 2019 00:13:21 -0400 Subject: [PATCH 6/6] fixed --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 345cb12c58..8101fabdb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,12 +18,12 @@ pipeline { steps { sh './jenkins/scripts/test.sh' } - stage('Deliver') { - steps { - sh './jenkins/scripts/deliver.sh' - input message: 'Finished using web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' - } + } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' } } }