Alter release process to handle new meta walker info
This commit is contained in:
parent
55a087b237
commit
a342a0f482
1 changed files with 6 additions and 6 deletions
|
|
@ -112,10 +112,10 @@ def boolean getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolde
|
|||
// Copy relevant artifacts to temp folder
|
||||
summaryappend("Artifacts: ")
|
||||
def boolean result = true
|
||||
for (artifactfilter in buildinfo.meta.releaseinfo.releaseitems) {
|
||||
for (artifactfilter in buildinfo.metainfo.releaseinfo.releaseitems) {
|
||||
def filterpath = artifactfilter
|
||||
if (buildinfo.offsetpath) {
|
||||
filterpath = buildinfo.offsetpath + '/' + artifactfilter
|
||||
if (buildinfo.accumulatedpath) {
|
||||
filterpath = buildinfo.accumulatedpath + '/' + artifactfilter
|
||||
}
|
||||
// Copy relevant artifacts to temp folder
|
||||
echo "Copying artifacts: ${filterpath} to ${tempfolder}"
|
||||
|
|
@ -136,7 +136,7 @@ def boolean getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolde
|
|||
}
|
||||
if (result) {
|
||||
// Move relevant artifacts from temp folder to release position
|
||||
def originalrootdir = tempfolder + "/" + buildinfo.offsetpath
|
||||
def originalrootdir = tempfolder + "/" + buildinfo.accumulatedpath
|
||||
dir(originalrootdir) {
|
||||
sh("mv * ${repofolder}")
|
||||
}
|
||||
|
|
@ -375,7 +375,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
|
|||
}
|
||||
|
||||
def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) {
|
||||
def buildmeta = buildinfo.meta
|
||||
def buildmeta = buildinfo.metainfo
|
||||
def uriconverted = gh.uniquereporootname(buildmeta.gitinfo.remoteurl)
|
||||
def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${uriconverted}"
|
||||
def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
|
||||
|
|
@ -427,7 +427,7 @@ def releasehierarchy(String buildfolder, String metafolder, buildmeta, String ma
|
|||
|
||||
for (key in componentReleaseInfo.keySet()) {
|
||||
def buildinfo = componentReleaseInfo[key]
|
||||
if (!buildinfo.jenkinsbuildinfo.isFullBuild()) {
|
||||
if (!buildinfo.metainfo.jenkinsbuildinfo.isFullBuild()) {
|
||||
error "The subcomponent: ${buildinfo.componentidentifier()} is not a full build (Some artifacts are missing)"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue