Merge commit '628fe40745'
This commit is contained in:
commit
3277e080c0
2 changed files with 10 additions and 10 deletions
|
|
@ -118,8 +118,8 @@ class GitInfo extends GISJsonSerialised {
|
|||
}
|
||||
|
||||
class JenkinsBuildInfo extends GISJsonSerialised {
|
||||
private String buildjobname
|
||||
private int buildnumber
|
||||
String buildjobname
|
||||
int buildnumber
|
||||
private String buildmachine
|
||||
private String builddate
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) {
|
|||
// Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta
|
||||
def previousreleasemeta = buildmeta.getNewMetaObject(this)
|
||||
dir(releaserepofolder) {
|
||||
sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}")
|
||||
sh("git clone ${releaserepo} ${checkoutfolder}")
|
||||
}
|
||||
previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder)
|
||||
dir(checkoutfolder) {
|
||||
|
|
@ -92,7 +92,7 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) {
|
|||
}
|
||||
}
|
||||
|
||||
def getcomponentartifacts(buildinfo, String repofolder, String tempfolder) {
|
||||
def getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolder, String tempfolder) {
|
||||
// Copy relevant artifacts to temp folder
|
||||
summaryappend("Artifacts: ")
|
||||
for (artifactfilter in buildinfo.meta.releaseinfo.releaseitems) {
|
||||
|
|
@ -104,10 +104,10 @@ def getcomponentartifacts(buildinfo, String repofolder, String tempfolder) {
|
|||
echo "Copying artifacts: ${filterpath} to ${tempfolder}"
|
||||
copyArtifacts(
|
||||
filter: filterpath,
|
||||
projectName: BUILD_JOB,
|
||||
projectName: toplevelbuildmeta.jenkinsbuildinfo.buildjobname,
|
||||
selector: [
|
||||
$class: 'ParameterizedBuildSelector',
|
||||
parameterName: BUILD_JOB_SELECTOR
|
||||
parameterName: "<SpecificBuildSelector plugin='copyartifact@1.41'><buildNumber>${toplevelbuildmeta.jenkinsbuildinfo.buildnumber}</buildNumber></SpecificBuildSelector>"
|
||||
],
|
||||
target: tempfolder
|
||||
)
|
||||
|
|
@ -315,7 +315,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
|
|||
}
|
||||
}
|
||||
|
||||
def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) {
|
||||
def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) {
|
||||
def buildmeta = buildinfo.meta
|
||||
def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}"
|
||||
def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
|
||||
|
|
@ -327,7 +327,7 @@ def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) {
|
|||
|
||||
checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)
|
||||
|
||||
getcomponentartifacts(buildinfo, uniquefolderforrepo, uniquefoldertemp)
|
||||
getcomponentartifacts(toplevelbuildmeta, buildinfo, uniquefolderforrepo, uniquefoldertemp)
|
||||
|
||||
gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, uniquefolderforsourcerepo, otherreleasetags, dryrunpush)
|
||||
|
||||
|
|
@ -368,12 +368,12 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String
|
|||
for (key in componentReleaseInfo.keySet()) {
|
||||
def buildinfo = componentReleaseInfo[key]
|
||||
if (toplevelid != key) {
|
||||
releasecomponent(buildinfo, otherreleasetags, dryrunpush)
|
||||
releasecomponent(buildmeta, buildinfo, otherreleasetags, dryrunpush)
|
||||
}
|
||||
}
|
||||
// Do the top level last
|
||||
def toplevelbuildinfo = componentReleaseInfo[toplevelid]
|
||||
releasecomponent(toplevelbuildinfo, otherreleasetags, dryrunpush)
|
||||
releasecomponent(buildmeta, toplevelbuildinfo, otherreleasetags, dryrunpush)
|
||||
|
||||
return [summarystring, markunstable, unstablereason]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue