From 67d92ba13af4f6cf4e3143d83efc72e31f3f3a3a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Jan 2019 14:13:42 +0000 Subject: [PATCH 1/3] Make other tags component unique --- release/do.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 1ded952..852f6f3 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -157,14 +157,15 @@ def boolean checkforchange(buildmeta, previousreleasemeta) { return changed } -def ArrayList maketaglist(String buildstamp, String otherreleasetags) { +def ArrayList maketaglist(buildmeta, String buildstamp, String otherreleasetags) { def ArrayList taglist = new ArrayList() taglist.add(buildstamp) def ArrayList othertaglist = otherreleasetags.split(',') for (othertagitem in othertaglist) { if (othertagitem?.trim()) { - taglist.add(othertagitem.trim()) + componentothertagitem = "${othertagitem}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" + taglist.add(componentothertagitem.trim()) } } return taglist @@ -288,7 +289,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Post commit sha code: ${postcommitshacode}" - ArrayList taglist = maketaglist(buildstamp, otherreleasetags) + ArrayList taglist = maketaglist(buildmeta, buildstamp, otherreleasetags) def tagadded = releasegittags(postcommitshacode, taglist) if (changed || tagadded) { @@ -300,7 +301,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def String buildsha = buildmeta.gitinfo.gitrevision if (buildsha) { - def ArrayList srctaglist = maketaglist(srcbuildstamp, otherreleasetags) + def ArrayList srctaglist = maketaglist(buildmeta, srcbuildstamp, otherreleasetags) def tagadded = sourcegittags(buildsha, srctaglist) if (tagadded) { sourcegitpush(dryrunpush) From 94b5ef18591b9a26758c93702221dc51d04ebc75 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Jan 2019 14:25:20 +0000 Subject: [PATCH 2/3] Make other tags component unique; Report more info --- release/do.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 852f6f3..0e53b7f 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -32,7 +32,8 @@ def preconditions() { def setunstable(String reason) { markunstable = true - unstablereason = reason + unstablereason += reason + "\n" + echo "Marked build as unstable: Reason: ${reason}" } def summaryappend(String summary) { From f4d8ff7a5315f15a6a91ad4eb2fd10c086bd582b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Jan 2019 14:35:37 +0000 Subject: [PATCH 3/3] Make other tags component unique; Report more info --- release/do.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 0e53b7f..0ea3399 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -165,8 +165,8 @@ def ArrayList maketaglist(buildmeta, String buildstamp, String otherrele def ArrayList othertaglist = otherreleasetags.split(',') for (othertagitem in othertaglist) { if (othertagitem?.trim()) { - componentothertagitem = "${othertagitem}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" - taglist.add(componentothertagitem.trim()) + def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" + taglist.add(componentothertagitem) } } return taglist