Refactoring

InCommon · May 3, 2017 · 4c9e8af · 4c9e8af
1 parent 3fc2e05
commit 4c9e8af
Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/src/edu/internet2/jenkins/DockerBuild.groovy b/src/edu/internet2/jenkins/DockerBuild.groovy
@@ -26,12 +26,18 @@ class DockerBuild implements Serializable {
   }
 
   def maintainer() {
-    readCommonBash('maintainer')
+    def m = readCommonBash('maintainer')
+    if(m == null){
+      throw "Maintainer must be defined in common.bash"
+    }else{
+      m
+    }
+
   }
 
   def readCommonBash(String key = 'maintainer') {
     def matcher = config =~ (key + '="(.+)"')
-    matcher ? matcher[0][1] : 'null'
+    matcher ? matcher[0][1] : null
   }
 
   def build(args){

diff --git a/vars/imagename.groovy b/vars/imagename.groovy
diff --git a/vars/maintainer.groovy b/vars/maintainer.groovy
diff --git a/vars/readCommonBash.groovy b/vars/readCommonBash.groovy
diff --git a/vars/tag.groovy b/vars/tag.groovy