Adjust publish script to handle buildstamps appended with build number

This commit is contained in:
Dan Hawkins 2019-01-27 11:11:17 +00:00
commit 5c5bc9a978

View file

@ -44,7 +44,7 @@ def getcomponentartifacts(releaseinfo, String repofolder, String tempfolder) {
def releasemeta = releaseinfo.meta
def String componentURL = releasemeta.releaseinfo.releaserepoURL
def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}"
def String revision = "refs/tags/${releasemeta.buildstampinfo.buildstamp}_${releasemeta.jenkinsbuildinfo.buildnumber}"
def publishableitems = releasemeta.publishableinfo
def ArrayList<String> publishablePaths = new ArrayList<String>()
if (publishableitems.size() > 0) {
@ -78,11 +78,11 @@ def publish(String customer) {
def recallcomponent(releaseinfo, String softwarerelease) {
def releasemeta = releaseinfo.meta
def String uniquefolder = "Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}"
def String uniquefolder = "Software/${PRODUCT_NAME} ${software_release}/${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}_${releasemeta.jenkinsbuildinfo.buildnumber}"
def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ")
summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname} ${releasemeta.jenkinsbuildinfo.buildnumber}: ")
getcomponentartifacts(releaseinfo, uniquefolderforrepo, uniquefoldertemp)