diff --git a/publish/do.groovy b/publish/do.groovy index e280c0c..76dc025 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -107,10 +107,16 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin resetfolders() preconditions() - // Walk the meta information to a max depth, looking for artifacts to import for release - componentReleaseInfo = releasemeta.releasewalkerunique(md) + // Walk the meta information to a max depth, looking for artifacts to publish + (componentReleaseInfo, componentReleaseInfoVersionUnique) = releasemeta.releasewalkerunique(md) // For each component + echo "Components in publish:" + for (key in componentReleaseInfo.keySet()) { + def releaseinfo = componentReleaseInfo[key] + echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } + for (key in componentReleaseInfo.keySet()) { def releaseinfo = componentReleaseInfo[key] recallcomponent(releaseinfo, softwarerelease) diff --git a/release/do.groovy b/release/do.groovy index e264cc0..cbecc08 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -338,8 +338,27 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String resetfolders() preconditions() - // Walk the meta information to a max depth, looking for artifacts to import for release - componentReleaseInfo = buildmeta.releasewalkerunique(md) + // Walk the meta information to a max depth, looking for components to release + (componentReleaseInfo, componentReleaseInfoVersionUnique) = releasemeta.releasewalkerunique(md) + + + echo "Components in release:" + for (key in componentReleaseInfo.keySet()) { + def releaseinfo = componentReleaseInfo[key] + echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } + + echo "Version unique components in release:" + for (key in componentReleaseInfoVersionUnique.keySet()) { + def releaseinfo = componentReleaseInfoVersionUnique[key] + echo "${releaseinfo.offsetpath} : ${releaseinfo.meta.componentversionuniqueidentifier()}" + } + + if (DO_INTEGRITY_CHECK == "true") { + if (componentReleaseInfo.size() != componentReleaseInfoVersionUnique()) { + error "There are 2 or more versions of the same component being used in this hierarchy: Is this correct?" + } + } def toplevelid = buildmeta.componentidentifier() // For each component