Revision number needs to be altered if a job imports a dependent component; Make sure imports happen after the initial revision number is calculated
This commit is contained in:
parent
cf977356fc
commit
04cc212c89
3 changed files with 15 additions and 8 deletions
|
|
@ -4,7 +4,6 @@ def combineSubjobArtifacts(meta, subJobs) {
|
|||
def importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
|
||||
|
||||
def ArrayList<String> artifactFolders = new ArrayList<String>()
|
||||
int revisiontotal = 0
|
||||
for (subJob in subJobs) {
|
||||
def subJobObject = subJob[0]
|
||||
if (subJobObject != null) {
|
||||
|
|
@ -14,14 +13,11 @@ def combineSubjobArtifacts(meta, subJobs) {
|
|||
dir(destFolder) {
|
||||
deleteDir()
|
||||
}
|
||||
importedmeta = importer.artifactimport(meta, subJobName, subJobNumber, destFolder)
|
||||
revisiontotal += importedmeta.buildstampinfo.revision
|
||||
importer.artifactimport(meta, subJobName, subJobNumber, destFolder)
|
||||
artifactFolders.add("${destFolder}/**")
|
||||
}
|
||||
}
|
||||
def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
|
||||
revisiontotal = revisiontotal % (versiongenerator.maxversionnumber() + 1)
|
||||
return [artifactFolders, revisiontotal]
|
||||
return artifactFolders
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
|
||||
|
||||
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) {
|
||||
copyArtifacts(
|
||||
filter: filter,
|
||||
|
|
@ -7,7 +9,9 @@ def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, St
|
|||
selector: specific(buildnumber.toString()),
|
||||
target: destpath
|
||||
)
|
||||
return meta.importrelated(destpath)
|
||||
def importedmeta = meta.importrelated(destpath)
|
||||
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
|
||||
return importedmeta
|
||||
}
|
||||
|
||||
def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) {
|
||||
|
|
@ -21,7 +25,9 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat
|
|||
],
|
||||
target: destpath
|
||||
)
|
||||
return meta.importrelated(destpath)
|
||||
def importedmeta = meta.importrelated(destpath)
|
||||
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
|
||||
return importedmeta
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
|
|||
|
|
@ -136,4 +136,9 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum
|
|||
return buildstamp
|
||||
}
|
||||
|
||||
int incrementrevision(int current, int increment) {
|
||||
def int newrevision = (current + increment) % (maxversionnumber() + 1)
|
||||
return newrevision
|
||||
}
|
||||
|
||||
return this;
|
||||
Loading…
Add table
Add a link
Reference in a new issue