From ce93cdb372560f2313802310f84442ac3e168a8a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 14 Jan 2019 13:40:33 +0000 Subject: [PATCH] Do an integrity check at release time; Print out information about components --- meta/folder.groovy | 25 ++++++++++++++++++++++--- publish/do.groovy | 8 +++++++- release/do.groovy | 17 ++++++++++++++++- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ff56928..2ef8e22 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -662,17 +662,36 @@ class MetaInfo extends GISJsonSerialised { return productinfo.productname + "_" + productinfo.subcomponentname } + String componentversionuniqueidentifier() { + return productinfo.productname + "_" + productinfo.subcomponentname + "_" + buildstampinfo.buildstamp + } + Map releasewalkerunique(int maxdepth, String startpath = "") { - Map releasemetauniquecollection = new LinkedHashMap() - ArrayList releasemetacollection = new ArrayList() + def ArrayList releasemetacollection = new ArrayList() releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) + + def Map releasemetauniquecollection = new LinkedHashMap() for (relatedmetainfo in releasemetacollection) { - String uniquestring = relatedmetainfo.meta.componentidentifier() + def String uniquestring = relatedmetainfo.meta.componentidentifier() releasemetauniquecollection.put(uniquestring, relatedmetainfo) } + return releasemetauniquecollection } + Map releasewalkerversionunique(int maxdepth, String startpath = "") { + ArrayList releasemetacollection = new ArrayList() + releasemetacollection = releasewalkerp(maxdepth, releasemetacollection, startpath) + + def Map releasemetaversionuniquecollection = new LinkedHashMap() + for (relatedmetainfo in releasemetacollection) { + def String uniquestring = relatedmetainfo.meta.componentversionuniqueidentifier() + releasemetaversionuniquecollection.put(uniquestring, relatedmetainfo) + } + + return releasemetaversionuniquecollection + } + MetaInfo getNewMetaObject(script) { return new MetaInfo(script) } diff --git a/publish/do.groovy b/publish/do.groovy index 907f328..a88f018 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -108,7 +108,13 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin preconditions() // Walk the meta information to a max depth, looking for artifacts to publish - (componentReleaseInfo, componentReleaseInfoVersionUnique) = releasemeta.releasewalkerunique(md) + def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md) + + echo "Version unique components:" + for (key in componentReleaseInfoVersionUnique.keySet()) { + def releaseinfo = componentReleaseInfoVersionUnique[key] + echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } for (key in componentReleaseInfoVersionUnique.keySet()) { def releaseinfo = componentReleaseInfoVersionUnique[key] diff --git a/release/do.groovy b/release/do.groovy index b2577fb..172861b 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -339,7 +339,22 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String preconditions() // Walk the meta information to a max depth, looking for components to release - (componentReleaseInfo, componentReleaseInfoVersionUnique) = buildmeta.releasewalkerunique(md) + def componentReleaseInfo = buildmeta.releasewalkerunique(md) + + script.echo "Unique components:" + for (key in componentReleaseInfo.keySet()) { + def releaseinfo = componentReleaseInfo[key] + script.echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } + + // Walk the meta information to a max depth, looking for components to release + def componentReleaseInfoVersionUnique = buildmeta.releasewalkerversionunique(md) + + echo "Version unique components:" + for (key in componentReleaseInfoVersionUnique.keySet()) { + def releaseinfo = componentReleaseInfoVersionUnique[key] + echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } if (DO_INTEGRITY_CHECK == "true") { if (componentReleaseInfo.size() != componentReleaseInfoVersionUnique.size()) {