# HG changeset patch # User smith@nwoca.org # Date 1450802733 0 # Node ID 068d09f5b627350888499639671606cd45d43e2d # Parent 07baf02b6034f8e3719698e9f9012a398eb3e08b improve deploy name diff -r 07baf02b6034 -r 068d09f5b627 init20.gradle --- a/init20.gradle Sat Dec 19 15:30:52 2015 +0000 +++ b/init20.gradle Tue Dec 22 16:45:33 2015 +0000 @@ -66,6 +66,7 @@ println "$gradle.runtimeInfo" println gradle.branch println gradle.branch.imageId +println gradle.branch.deployName loadEnvironments() @@ -573,7 +574,7 @@ -@ToString(includes=['name','shortName','buildVersion','imageId'],includeNames= true) +@ToString(includes=['name','shortName','buildVersion','imageId','deployName'],includeNames= true) class BranchInfo { def name def stream = "none" @@ -598,9 +599,15 @@ } def getImageId() { - (buildVersion ?: shortName.take(20)) + (buildNumber ? "-${buildNumber}" : "") + (buildVersion ?: shortName.take(25)) + (buildNumber ? "-${buildNumber}" : "-0") } + def getDeployName() { + (buildVersion ?: shortName.take(25)).toLowerCase().collectReplacements { + ('a'..'z').contains(it) || ('0'..'9').contains(it) || it == "-" ? null : '-' + } + } + def getHash() { generateMD5(name) }