Make the walkers carry more meta data

This commit is contained in:
Dan Hawkins 2021-12-17 11:50:07 +00:00
commit 93ad1bea33
3 changed files with 8 additions and 8 deletions

View file

@ -1039,7 +1039,7 @@ class MetaInfo extends GISJsonSerialised {
}
Map<String, CollectedMeta> releasewalkerversionunique(int maxdepth, String startpath = '', String startmetapath = '') {
def ArrayList<CollectedMeta> metacollection = releasewalker(maxdepth, "${startpath}/${METAFOLDERNAME}", startmetapath)
def ArrayList<CollectedMeta> metacollection = releasewalker(maxdepth, startpath, "${startmetapath}/${METAFOLDERNAME}")
def Map<String, CollectedMeta> versionuniquecollection = new LinkedHashMap<String, CollectedMeta>()
for (metaitem in metacollection) {
@ -1050,10 +1050,10 @@ class MetaInfo extends GISJsonSerialised {
return versionuniquecollection
}
Map<String, MetaInfo> releasewalkerunique(int maxdepth, String startpath = '') {
def ArrayList<MetaInfo> metacollection = releasewalker(maxdepth, "${startpath}/${METAFOLDERNAME}")
Map<String, MetaInfo> releasewalkerunique(int maxdepth, String startpath = '', String startmetapath = '') {
def ArrayList<CollectedMeta> metacollection = releasewalker(maxdepth, startpath, "${startmetapath}/${METAFOLDERNAME}")
def Map<String, MetaInfo> uniquecollection = new LinkedHashMap<String, MetaInfo>()
def Map<String, CollectedMeta> uniquecollection = new LinkedHashMap<String, CollectedMeta>()
for (metaitem in metacollection) {
def String uniquestring = metaitem.metainfo.componentidentifier()
uniquecollection.put(uniquestring, metaitem)

View file

@ -396,13 +396,13 @@ def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, Stri
repoandtagsappend("\n")
}
def releasehierarchy(buildfolder, buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) {
def releasehierarchy(String buildfolder, String metafolder, buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) {
def int md = maxdepth.toInteger()
resetfolders()
preconditions()
// Walk the meta information to a max depth, looking for components to release
def componentReleaseInfo = buildmeta.releasewalkerunique(md, buildfolder)
def componentReleaseInfo = buildmeta.releasewalkerunique(md, buildfolder, metafolder)
echo "Unique components:"
def String versioncomponent = ""
for (key in componentReleaseInfo.keySet()) {
@ -411,7 +411,7 @@ def releasehierarchy(buildfolder, buildmeta, String maxdepth, String otherreleas
echo versioncomponent
// Walk the meta information to a max depth, looking for components to release
def componentReleaseInfoVersionUnique = buildmeta.releasewalkerversionunique(md, buildfolder)
def componentReleaseInfoVersionUnique = buildmeta.releasewalkerversionunique(md, buildfolder metafolder)
echo "Version unique components:"
def String versionuniquecomponent = ""
for (key in componentReleaseInfoVersionUnique.keySet()) {

View file

@ -42,7 +42,7 @@ pipeline {
def releaser = load("${autobuilder.commonscripts()}/release/do.groovy")
// Place the top level build stamp on all
OTHER_RELEASE_TAGS = "${buildmeta.globalreleasetag()},${OTHER_RELEASE_TAGS}"
(summarystring, markunstable, unstablereason) = releaser.releasehierarchy(BUILD_ARTIFACTS, buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH)
(summarystring, markunstable, unstablereason) = releaser.releasehierarchy('', BUILD_ARTIFACTS, buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH)
if (markunstable) {
env.unstablereason = unstablereason
currentBuild.result = 'UNSTABLE'