# HG changeset patch # User smith@nwoca.org # Date 1450539052 0 # Node ID 07baf02b6034f8e3719698e9f9012a398eb3e08b # Parent f200b931ea9de56505d06e951daae690c3e8712c add helper for calculating imageid diff -r f200b931ea9d -r 07baf02b6034 init20.gradle --- a/init20.gradle Sat Dec 19 14:26:46 2015 +0000 +++ b/init20.gradle Sat Dec 19 15:30:52 2015 +0000 @@ -64,6 +64,8 @@ gradle.ext.branchHash = gradle.branch.hash println "${gradle.hgRepositoryUrl} ${gradle.branch}" println "$gradle.runtimeInfo" +println gradle.branch +println gradle.branch.imageId loadEnvironments() @@ -571,10 +573,11 @@ -@ToString +@ToString(includes=['name','shortName','buildVersion','imageId'],includeNames= true) class BranchInfo { def name def stream = "none" + def buildNumber = "" BranchInfo(name) { this.name = name @@ -583,7 +586,20 @@ } this.name = this.name.replace('@', '-') determineStream() + buildNumber = System.getenv('bamboo_buildNumber') ?: "" } + + def getShortName() { + def result = name.contains('/') ? name.split('/')[1] : name + } + + def getBuildVersion() { + stream in ['release','hotfix'] ? shortName - "v": "" + } + + def getImageId() { + (buildVersion ?: shortName.take(20)) + (buildNumber ? "-${buildNumber}" : "") + } def getHash() { generateMD5(name)