From 4ad0007dceb8155e7d6988c26e7e15e21aaae9f0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 14 Jan 2019 13:14:57 +0000 Subject: [PATCH] Do an integrity check at release time; Print out information about components --- publish/do.groovy | 11 ++--------- release/do.groovy | 14 +------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 76dc025..907f328 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -110,15 +110,8 @@ def publishhierarchy(releasemeta, String customer, String softwarerelease, Strin // 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] + for (key in componentReleaseInfoVersionUnique.keySet()) { + def releaseinfo = componentReleaseInfoVersionUnique[key] recallcomponent(releaseinfo, softwarerelease) } stripgithistory() diff --git a/release/do.groovy b/release/do.groovy index d1952f0..b2577fb 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -341,20 +341,8 @@ def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String // Walk the meta information to a max depth, looking for components to release (componentReleaseInfo, componentReleaseInfoVersionUnique) = buildmeta.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()) { + if (componentReleaseInfo.size() != componentReleaseInfoVersionUnique.size()) { error "There are 2 or more versions of the same component being used in this hierarchy: Is this correct?" } }