GIS-1621 - Import for version numbering but don't append to meta data

This commit is contained in:
Dan Hawkins 2019-12-20 16:04:34 +00:00
commit 83e8b67ca6

View file

@ -1,36 +1,122 @@
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) {
copyArtifacts(
filter: filter,
excludes: excludes,
fingerprintArtifacts: fingerprint,
projectName: jenkinsjob.trim(),
selector: specific(buildnumber.toString()),
target: destpath
)
def importedmeta = meta.importrelated(destpath)
if (incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
class ImportOptions {
def script // Script to use if wanting to execute script commands (eg. echo -> script.echo)
boolean incrementversionnumber // If true, increment the parent's (4th) version number with the (4th) version number of this object being imported
String filter // Only import files/paths/folders that match the filter
String excludes // Exclude files/paths/folders that match the exclude filter
boolean fingerprint // Do Jenkins fingerprinting on imported artifacts
boolean nested // Import all child artifacts too (identified in the related meta info
boolean appendtoparentmeta // Append to parent meta
String source // Where are the artifacts coming from
String jenkinsjob
def buildnumberorselector
String repo
String revision
ImportOptions(script,
String source = 'Jenkins job artifact'
boolean incrementversionnumber = true,
String filter = '',
String excludes = '',
boolean fingerprint = false,
boolean nested = false,
appendtoparentmeta = true) {
this.script = script
setsource(source)
setIncrementVersionNumber(incrementversionnumber)
setfilter(filter)
setexcludes(excludes)
setfingerprint(fingerprint)
setnested(nested)
setappendtoparentmeta(appendtoparentmeta)
}
setsource(String source) {
source = source.trim()
switch (source) {
case 'Jenkins job artefact':
this.source = 'Jenkins job artifact'
break
case 'Jenkins job artifact':
case 'Release repository':
this.source = source
break
default:
error("Unknown type of artifact source: ${source}")
}
}
setIncrementVersionNumber(boolean incrementversionnumber) {
this.incrementversionnumber = incrementversionnumber
}
setfilter(String filter) {
this.filter = filter.trim()
}
setexcludes(String excludes) {
this.excludes = excludes.trim()
}
setfingerprint(boolean fingerprint) {
this.fingerprint = fingerprint
}
setnested(boolean nested) {
this.nested = nested
}
setappendtoparentmeta(boolean appendtoparentmeta) {
this.appendtoparentmeta = appendtoparentmeta
}
jenkinsjob(String jenkinsjob, buildnumberorselector) {
this.jenkinsjob = jenkinsjob.trim()
this.buildnumberorselector = buildnumberorselector.trim()
setsource('Jenkins job artifact')
}
releaserepo(String repo, String revision) {
this.repo = repo.trim()
this.revision = revision.trim()
setsource('Release repository')
}
source(String source, String jenkinsjob, buildnumberorselector, String repo, String revision) {
jenkinsjob(String jenkinsjob, buildnumberorselector)
releaserepo(String repo, String revision)
setsource(source)
}
return importedmeta
}
def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false) {
ImportOptions getNewImportOptions(script) {
return new ImportOptions(script)
}
def artifactimportfrombuildjob(meta, ImportOptions importoptions, String destpath) {
if (importoptions.source != 'Jenkins job artifact') {
error("Import options settings have not been set for: Jenkins job artifact")
return
}
copyArtifacts(
filter: filter,
excludes: excludes,
filter: importoptions.filter,
excludes: importoptions.excludes,
fingerprintArtifacts: fingerprint,
projectName: jenkinsjob.trim(),
projectName: importoptions.jenkinsjob,
selector: [
$class: 'ParameterizedBuildSelector',
parameterName: buildselector
parameterName: importoptions.buildselector
],
target: destpath
)
def importedmeta = meta.importrelated(destpath)
if (incrementversionnumber) {
if (importoptions.incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
}
return importedmeta
@ -42,13 +128,17 @@ def rewritemetafileasreleased(meta, String filepath) {
meta.saveJsonSerialised(filepath)
}
publisher = load("${autobuilder.commonscripts()}/publish/do.groovy")
def hierarchyartifactimportfromrepo(meta, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false) {
def rooturl = repo.trim()
def rootrevision = revision.trim()
def hierarchyartifactimportfromrepo(meta, ImportOptions importoptions, String destpath) {
if (importoptions.source != 'Release repository') {
error("Import options settings have not been set for: Release repository")
return
}
def rooturl = importoptions.repo
def rootrevision = importoptions.revision
echo "Cloning root release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(filter)
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(importoptions.filter)
gh.gitCheckoutAlt(rooturl, rootrevision, destpath, "", 1, true, sparseitemlist)
def importedmeta = meta.importrelated(destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
@ -76,18 +166,23 @@ def hierarchyartifactimportfromrepo(meta, String repo, String revision, String d
echo "Marking root meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(importedmeta, metafilepath)
if (incrementversionnumber) {
if (importoptions.incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
}
return importedmeta
}
def artifactimportfromrepo(meta, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false) {
def rooturl = repo.trim()
def rootrevision = revision.trim()
def artifactimportfromrepo(meta, ImportOptions importoptions, String destpath) {
if (importoptions.source != 'Release repository') {
error("Import options settings have not been set for: Release repository")
return
}
def rooturl = importoptions.repo
def rootrevision = importoptions.revision
echo "Cloning release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(filter)
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(importoptions.filter)
gh.gitCheckoutAlt(rooturl, rootrevision, destpath, "", 1, true, sparseitemlist)
def importedmeta = meta.importrelated(destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
@ -97,26 +192,71 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath,
echo "Marking meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(importedmeta, metafilepath)
if (incrementversionnumber) {
if (importoptions.incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
}
return importedmeta
}
def artifactimport(meta, String source, String jenkinsjob, buildnumberorselector, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false, boolean nested = false) {
switch (source) {
case "Jenkins job artifact":
case "Jenkins job artefact":
return artifactimport(meta, jenkinsjob, buildnumberorselector, destpath, incrementversionnumber, filter, excludes, fingerprint)
case "Release repository":
if (nested) {
return hierarchyartifactimportfromrepo(meta, repo, revision, destpath, incrementversionnumber, filter, excludes, fingerprint)
def artifactimport(meta, ImportOptions importoptions, String destpath) {
switch (importoptions.source) {
case 'Jenkins job artifact':
case 'Jenkins job artefact':
return artifactimportfrombuildjob(meta, importoptions, destpath)
case 'Release repository':
if (importoptions.nested) {
return hierarchyartifactimportfromrepo(meta, importoptions, destpath)
}
return artifactimportfromrepo(meta, repo, revision, destpath, incrementversionnumber, filter, excludes, fingerprint)
return artifactimportfromrepo(meta, importoptions, destpath)
default:
error("Unknown type of artifact source: ${source}")
}
return meta
}
// Deprecated (use above)
def artifactimport(meta,
String source,
String jenkinsjob,
buildnumberorselector,
String repo,
String revision,
String destpath,
boolean incrementversionnumber = true,
String filter = '',
String excludes = '',
boolean fingerprint = false,
boolean nested = false) {
importoptions = getNewImportOptions(this)
importoptions.source(source, jenkinsjob, buildnumberorselector, repo, revision)
importoptions.setincrementversionnumber(incrementversionnumber)
importoptions.setfilter(filter)
importoptions.setexcludes(excludes)
importoptions.setfingerprint(fingerprint)
importoptions.setnested(nested)
return artifactimport(meta, importoptions, destpath)
}
// Deprecated (use above)
def artifactimport(meta,
String jenkinsjob,
int buildnumber,
String destpath,
boolean incrementversionnumber = true,
String filter = '**',
String excludes = '',
boolean fingerprint = false) {
importoptions = getNewImportOptions(this)
importoptions.source(jenkinsjob, specific(buildnumber.toString())
importoptions.setincrementversionnumber(incrementversionnumber)
importoptions.setfilter(filter)
importoptions.setexcludes(excludes)
importoptions.setfingerprint(fingerprint)
return artifactimport(meta, importoptions, destpath)
}
return this;