Big upgrades to Jenkinsfile

Jenkinsfile.sample

@@ -5,46 +5,67 @@ node {
     checkout scm
 
   stage 'Acquire util'
-
-    sh 'mkdir -p bin'
-    dir('bin'){
+    
+    sh 'mkdir -p tmp && mkdir -p bin'
+    dir('tmp'){
       git([ url: "https://github.internet2.edu/docker/util.git",
           credentialsId: "jenkins-github-access-token" ])
-      sh 'ls'
-      sh 'mv bin/* .'
+      sh 'mv ./bin/* ../bin/.'
     }
+    sh 'rm -rf tmp'
 
+  stage 'Setting build context'
+
+    def maintainer = maintainer()
+    def imagename = imagename()
+    def tag
+
+    // Tag images created on master branch with 'latest'
+    if(env.BRANCH_NAME == "master"){
+      tag = "latest"
+    }else{
+      tag = env.BRANCH_NAME
+    }
+
+    if(!imagename){
+      echo "You must define an imagename in common.bash"
+      currentBuild.result = 'FAILURE'
+     }
+     if(maintainer){
+      echo "Building ${imagename}:${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');
-      def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
+      def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
       sh "rm -f ./debug"
       handleError(message)
     }
+
   stage 'Tests'
-
-    sh 'bin/test.sh'
-
+
+    try{
+      sh 'bin/test.sh &> debug'
+    } catch(error) {
+      def error_details = readFile('./debug');
+      def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
+      sh "rm -f ./debug"
+      handleError(message)
+    }
+
   stage 'Push'
 
     docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
           def baseImg = docker.build("$maintainer/$imagename")
           baseImg.push("$tag")
     }
-
+
+  stage 'Notify'
+
+    slackSend color: 'good', message: "$maintainer/$imagename:$tag pushed to DockerHub"
 
 }
 
@@ -62,6 +83,6 @@ def handleError(String message){
   echo "${message}"
   currentBuild.setResult("FAILED")
   slackSend color: 'danger', message: "${message}"
-  step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "$email-error-id", sendToIndividuals: true])
+  //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true])
   sh 'exit 1'
-}
+}