Make release job use meta
This commit is contained in:
parent
8522eb079a
commit
59d7b3f00f
2 changed files with 14 additions and 3 deletions
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
// Take a list of Sub-job descriptors and output folder pairs, copy the artifacts, while filling in a string of artifact folders
|
||||
def combineSubjobArtifacts(meta, subJobs) {
|
||||
def im = load("${autobuilder.commonscripts()}/import/importer.groovy")
|
||||
def importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
|
||||
|
||||
def artifactFolders = ""
|
||||
for (subJob in subJobs) {
|
||||
|
|
@ -13,7 +13,7 @@ def combineSubjobArtifacts(meta, subJobs) {
|
|||
dir(destFolder) {
|
||||
deleteDir()
|
||||
}
|
||||
im.artifactimport(meta, subJobName, specific(subJobNumber), destFolder)
|
||||
importer.artifactimport(meta, subJobName, subJobNumber, destFolder)
|
||||
artifactFolders += "${destFolder}/**,"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,15 @@
|
|||
|
||||
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) {
|
||||
copyArtifacts(
|
||||
filter: filter,
|
||||
fingerprintArtifacts: fingerprint,
|
||||
projectName: jenkinsjob.trim(),
|
||||
selector: specific(buildnumber.toString()),
|
||||
target: destpath
|
||||
)
|
||||
meta.importrelated(destpath)
|
||||
}
|
||||
|
||||
def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) {
|
||||
copyArtifacts(
|
||||
filter: filter,
|
||||
|
|
@ -13,4 +24,4 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat
|
|||
meta.importrelated(destpath)
|
||||
}
|
||||
|
||||
return this;
|
||||
return this;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue