GIS-1621 - The PRODUCT_NAME variable is not necessarily defined; Use the top level product name instead

This commit is contained in:
Dan Hawkins 2019-09-15 20:42:03 +01:00
commit d1475e7619

View file

@ -25,12 +25,12 @@ def productuniquefolder(releasemeta) {
return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}"
}
def uniquereleasefolder(String softwarerelease, releasemeta) {
return "Software/${softwarerelease}/${productuniquefolder(releasemeta)}"
def uniquereleasefolder(String productline, String softwarerelease, releasemeta) {
return "Software/${productline} ${softwarerelease}/${productuniquefolder(releasemeta)}"
}
def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) {
return "${releaserepofolder}/${uniquereleasefolder(softwarerelease, releasemeta)}"
def uniqueabsoluterreleasefolder(String productline, String releaserepofolder, String softwarerelease, releasemeta) {
return "${releaserepofolder}/${uniquereleasefolder(productline, softwarerelease, releasemeta)}"
}
def preconditions() {
@ -116,9 +116,9 @@ def copydirectory(File dirFrom, File dirTo) {
}
}
def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) {
def recallcomponent(String productline, releaseinfo, String softwarerelease, itempathstopublish) {
def releasemeta = releaseinfo.meta
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(releaserepofolder, softwarerelease, releasemeta)
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(productline, releaserepofolder, softwarerelease, releasemeta)
summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ")
@ -149,6 +149,7 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer,
resetfolders()
preconditions()
def productline = releasemeta.productinfo.productname
// Walk the meta information to a max depth, looking for artifacts to publish
def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md)
@ -162,7 +163,7 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer,
def itempathstopublish = convertitemstopublish(itemstopublishstring)
for (key in componentReleaseInfoVersionUnique.keySet()) {
def releaseinfo = componentReleaseInfoVersionUnique[key]
recallcomponent(releaseinfo, softwarerelease, itempathstopublish)
recallcomponent(productline, releaseinfo, softwarerelease, itempathstopublish)
}
gh.stripgithistory(releaserepofolder)
publish(customer)