From 3836e8bd9b803ced5954eb365fded09ac84eca19 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 24 Aug 2016 17:56:16 -0400 Subject: [PATCH] More rearrange --- Jenkinsfile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1180fa0..c638f2f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,20 +13,21 @@ node('docker') { sh 'ls' sh 'mv bin/* ../bin/.' } + stage 'Environment' + + def maintainer = maintainer() + def imagename = imagename() + def tag = env.BRANCH_NAME + if(!imagename){ + echo "You must define an imagename in common.bash" + currentBuild.result = 'FAILURE' + } + if(maintainer){ + echo "Building ${maintainer}:${tag} for ${maintainer}" + } stage 'Build' try{ - def maintainer = maintainer() - def imagename = imagename() - def tag = env.BRANCH_NAME - if(!imagename){ - echo "You must define an imagename in common.bash" - currentBuild.result = 'FAILURE' - } - if(maintainer){ - echo "Building ${maintainer}:${tag} for ${maintainer}" - } - sh 'bin/build.sh &> debug' } catch(error) { def error_details = readFile('./debug');