Create a version number for the all build
This commit is contained in:
parent
fca9f9f00d
commit
3f8bb3f6f7
2 changed files with 15 additions and 3 deletions
|
|
@ -4,6 +4,7 @@ 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) {
|
||||
|
|
@ -13,11 +14,14 @@ def combineSubjobArtifacts(meta, subJobs) {
|
|||
dir(destFolder) {
|
||||
deleteDir()
|
||||
}
|
||||
importer.artifactimport(meta, subJobName, subJobNumber, destFolder)
|
||||
importedmeta = importer.artifactimport(meta, subJobName, subJobNumber, destFolder)
|
||||
revisiontotal += importedmeta.buildstampinfo.revision
|
||||
artifactFolders.add("${destFolder}/**")
|
||||
}
|
||||
}
|
||||
return artifactFolders;
|
||||
def versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
|
||||
revisiontotal = revisiontotal % (versiongenerator.MAXVERSIONNUMBER + 1)
|
||||
return [artifactFolders, revisiontotal]
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
|||
|
||||
class BuildStampInfo extends GISJsonSerialised {
|
||||
private String buildstampprefix
|
||||
private int revision
|
||||
int revision
|
||||
String buildstamp
|
||||
String buildstampcommasep
|
||||
|
||||
|
|
@ -156,6 +156,14 @@ class BuildStampInfo extends GISJsonSerialised {
|
|||
this.buildstampcommasep = buildstampcommasep
|
||||
}
|
||||
|
||||
void changerevision(int newrevision) {
|
||||
revision = newrevision
|
||||
buildstampsplit = buildstamp.split('.')
|
||||
buildstampsplit[3] = newrevision.toString()
|
||||
buildstamp = buildstampsplit.join('.')
|
||||
buildstampcommasep = buildstampsplit.join(',')
|
||||
}
|
||||
|
||||
void deserialiseJson(rawmeta) {
|
||||
buildstampprefix = rawmeta['buildstampprefix']
|
||||
revision = rawmeta['revision']
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue