From 41ec5e4630bdac11f8d4315699637a4fbce42731 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Oct 2020 11:00:08 +0100 Subject: [PATCH] Release_to_git: Handle the case where the URI to the source repo associated with a subsystem and product name has changed --- release/do.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 3221d25..9148572 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -1,3 +1,5 @@ +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") + markunstable = false unstablereason = "" @@ -373,7 +375,8 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) { def buildmeta = buildinfo.meta - def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" + def uriconverted = gh.uniquereporootname(buildmeta.gitinfo.remoteurl) + def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${uriconverted}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"