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

This commit is contained in:
Dan Hawkins 2019-12-20 17:31:14 +00:00
commit 7af31083e0
3 changed files with 9 additions and 10 deletions

View file

@ -720,8 +720,8 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
echo "Comparing product meta hierarchy from folders: ${earlymetafolder} and ${latermetafolder} to a depth of ${md}. Exporting summary to ${summaryfolder}"
def earlymeta = meta.importrelated(earlymetafolder)
def latermeta = meta.importrelated(latermetafolder)
def earlymeta = meta.importrelated(true, earlymetafolder)
def latermeta = meta.importrelated(true, latermetafolder)
def earlymetaitems = earlymeta.releasewalkerunique(md)
def latermetaitems = latermeta.releasewalkerunique(md)

View file

@ -82,21 +82,18 @@ class ImportOptions {
this.appendtoparentmeta = appendtoparentmeta
}
@NonCPS
void jenkinsjob(String jobname, String buildnumberorselector) {
this.jobname = jobname.trim()
this.buildnumberorselector = buildnumberorselector.trim()
setsource('Jenkins job artifact')
}
@NonCPS
void releaserepo(String repo, String revision) {
this.repo = repo.trim()
this.revision = revision.trim()
setsource('Release repository')
}
@NonCPS
void source(String source, String jobname, String buildnumberorselector, String repo, String revision) {
jenkinsjob(jobname, buildnumberorselector)
releaserepo(repo, revision)
@ -125,7 +122,7 @@ def artifactimportfrombuildjob(meta, ImportOptions importoptions, String destpat
],
target: destpath
)
def importedmeta = meta.importrelated(destpath)
def importedmeta = meta.importrelated(importoptions.appendtoparentmeta, destpath)
if (importoptions.incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
}
@ -151,7 +148,7 @@ def hierarchyartifactimportfromrepo(meta, ImportOptions importoptions, String de
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))
def importedmeta = meta.importrelated(importoptions.appendtoparentmeta, destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
relatedimportinfo = importedmeta.getassociated()
echo "Cloning associated repos"
@ -195,7 +192,7 @@ def artifactimportfromrepo(meta, ImportOptions importoptions, String destpath) {
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))
def importedmeta = meta.importrelated(importoptions.appendtoparentmeta, destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
gh.stripgithistory(destpath)
def metafilepath = "${destpath}/${meta.metafilepath()}"

View file

@ -605,7 +605,7 @@ class MetaInfo extends GISJsonSerialised {
return METAFOLDERNAME + "/" + METAFILENAME
}
MetaInfo importrelated(String destpath, String givenRepo = 'Unknown', String givenRevision = 'Unknown', String givenSHA = 'Unknown') {
MetaInfo importrelated(boolean appendtoparentmeta, String destpath, String givenRepo = 'Unknown', String givenRevision = 'Unknown', String givenSHA = 'Unknown') {
MetaInfo mi = new MetaInfo(script)
def String adjustedpath = relativize(destpath)
@ -618,7 +618,9 @@ class MetaInfo extends GISJsonSerialised {
}
RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi)
associatedmeta.add(rmi)
if (appendtoparentmeta) {
associatedmeta.add(rmi)
}
return mi
}