From 6c0b5c63c2575104f907fce6a75e3464638fc7dd Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 4 Jul 2019 23:59:08 +0100 Subject: [PATCH] Add more difference infrastructure --- differences/dometahierarchy.groovy | 65 +++++++++++++++++++++++++++++- differences/metahierarchy.groovy | 4 +- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index f3ffb80..cc3d168 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -8,6 +8,8 @@ summarystring = "" sourcerepofolder = "${WORKSPACE}/sourcerepos" tempfolder = "${WORKSPACE}/temp" +reportfolder = "${WORKSPACE}/reports" + class DifferenceRecord { String productname String subcomponentname @@ -45,6 +47,9 @@ def resetfolders() { dir(tempfolder) { deleteDir() } + dir(reportfolder) { + deleteDir() + } } def preconditions() { @@ -326,6 +331,62 @@ def addedcomponent(latermetaitems, key) { summaryappend("Added ") } +def boolean componentreport(meta, componentdifferencerecords) { + def ticketed = [:] + def merges = [:] + def reverts = [:] + def unticketed = [:] + def tickets = [:] + + for (record in componentdifferencerecords) { + if (dr.type == "Merge") { + merges[record.mergeinfo] = record + } + if (dr.type == "Revert") { + for (ticket in record.jiraticketinfo) { + if (!reverts.containsKey(ticket)) { + reverts[ticket] = [record.comment] + } else { + reverts[ticket].add(record.comment) + } + if (!tickets.containsKey(ticket)) { + tickets[ticket] = 1 + } else { + tickets[ticket] += 1 + } + } + } + if (dr.type == "Ticketed") { + for (ticket in record.jiraticketinfo) { + if (!ticketed.containsKey(ticket)) { + ticketed[ticket] = [record.comment] + } else { + ticketed[ticket].add(record.comment) + } + if (!tickets.containsKey(ticket)) { + tickets[ticket] = 1 + } else { + tickets[ticket] += 1 + } + } + } + if (dr.type == "Unticketed") { + unticketed[record.comment] = record + } + } + String componentreportfolder = "${reportfolder}/${meta.componentidentifier()}" + dir(componentreportfolder) { + String ticketlist = "Ticket list:\n" + for (ticketnumber in tickets.sort( { k1, k2 -> k1 <=> k2 } as Comparator )*.key) { + ticketlist += "${ticketnumber} (${tickets[ticketnumber]})" + } + writeFile(file: "ticketlist", text: ticketlist) + } +} +m.sort( { k1, k2 -> k1 <=> k2 } as Comparator )*.key +tickets.sort { a, b -> a.value <=> b.value } + + def comparehierarchy(meta, String earlymetafolder, String latermetafolder, String maxdepth, String summaryfolder) { def List differencerecords = [] @@ -346,11 +407,13 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin echo "Later items:" showmetaitems(latermetaitems) - + for (key in earlymetaitems.keySet()) { if (latermetaitems.containsKey(key)) { summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ") (result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key) + summaryappend("Items: ${componentdifferencerecords.size()} ") + componentreport(earlymeta, componentdifferencerecords) differencerecords = differencerecords + componentdifferencerecords summaryappend("\n") } else { diff --git a/differences/metahierarchy.groovy b/differences/metahierarchy.groovy index cd6738d..8a42f5e 100644 --- a/differences/metahierarchy.groovy +++ b/differences/metahierarchy.groovy @@ -13,11 +13,13 @@ pipeline { steps { script { SUMMARYDIR = "${WORKSPACE}/summary" + REPORTDIR = "${WORKSPACE}/reports" cleanfolders = [ "${WORKSPACE}/build_artifacts", "${WORKSPACE}/early", "${WORKSPACE}/later", "${SUMMARYDIR}", + "${REPORTDIR}", ] cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy") cleaner.clean(cleanfolders) @@ -59,7 +61,7 @@ pipeline { steps { script { def artifactlist = meta.generateartifacts() - archiveArtifacts "summary/**,${artifactlist}" + archiveArtifacts "summary/**,reports/**,${artifactlist}" } } }