GIS-1621 - Add a title to each report
This commit is contained in:
parent
ec1acff09b
commit
7bc58a493d
1 changed files with 33 additions and 21 deletions
|
|
@ -405,9 +405,9 @@ class MergeReportRecord {
|
|||
}
|
||||
}
|
||||
|
||||
def mergereport(String reportsubfolder, LinkedHashMap<String, MergeReportRecord> merges, boolean iscomponent = true) {
|
||||
def mergereport(String reportsubfolder, String title, LinkedHashMap<String, MergeReportRecord> merges, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
def String mergelist = "Merge list:\n"
|
||||
def String mergelist = "${title}\nMerge list:\n"
|
||||
def mergessorted = merges.sort()
|
||||
for (amerge in mergessorted) {
|
||||
def MergeReportRecord m = amerge.value
|
||||
|
|
@ -439,9 +439,9 @@ class RevertsReportRecord {
|
|||
}
|
||||
}
|
||||
|
||||
def revertsreport(String reportsubfolder, LinkedHashMap<String, RevertsReportRecord> reverts, boolean iscomponent = true) {
|
||||
def revertsreport(String reportsubfolder, String title, LinkedHashMap<String, RevertsReportRecord> reverts, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
def String revertlist = "Revert list:\n"
|
||||
def String revertlist = "${title}\nRevert list:\n"
|
||||
def revertssorted = reverts.sort()
|
||||
for (arevert in revertssorted) {
|
||||
def RevertsReportRecord r = arevert.value
|
||||
|
|
@ -470,9 +470,9 @@ class TicketedReportRecord {
|
|||
}
|
||||
}
|
||||
|
||||
def ticketedreport(String reportsubfolder, LinkedHashMap<String, TicketedReportRecord> ticketed, boolean iscomponent = true) {
|
||||
def ticketedreport(String reportsubfolder, String title, LinkedHashMap<String, TicketedReportRecord> ticketed, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
def String ticketedlist = "Ticketed list:\n"
|
||||
def String ticketedlist = "${title}\nTicketed list:\n"
|
||||
def ticketedsorted = ticketed.sort()
|
||||
for (aticketed in ticketedsorted) {
|
||||
def TicketedReportRecord r = aticketed.value
|
||||
|
|
@ -499,9 +499,9 @@ class UnticketedReportRecord {
|
|||
}
|
||||
}
|
||||
|
||||
def unticketedreport(String reportsubfolder, LinkedHashMap<String, UnticketedReportRecord> unticketed, boolean iscomponent = true) {
|
||||
def unticketedreport(String reportsubfolder, String title, LinkedHashMap<String, UnticketedReportRecord> unticketed, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
def String unticketedlist = "Unticketed list:\n"
|
||||
def String unticketedlist = "${title}\nUnticketed list:\n"
|
||||
def unticketedsorted = unticketed.sort()
|
||||
for (anunticketed in unticketedsorted) {
|
||||
UnticketedReportRecord u = anunticketed.value
|
||||
|
|
@ -523,9 +523,9 @@ class TicketsReportRecord {
|
|||
}
|
||||
}
|
||||
|
||||
def ticketsreport(String reportsubfolder, tickets, boolean iscomponent = true) {
|
||||
def ticketsreport(String reportsubfolder, String title, tickets, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
String ticketlist = "Ticket list:\n"
|
||||
String ticketlist = "${title}\nTicket list:\n"
|
||||
ticketssorted = tickets.sort()
|
||||
for (ticketnumber in ticketssorted) {
|
||||
TicketsReportRecord t = ticketnumber.value
|
||||
|
|
@ -535,9 +535,9 @@ def ticketsreport(String reportsubfolder, tickets, boolean iscomponent = true) {
|
|||
}
|
||||
}
|
||||
|
||||
def differencerecordsreport(String reportsubfolder, differencerecords, boolean iscomponent = true) {
|
||||
def differencerecordsreport(String reportsubfolder, String title, differencerecords, boolean iscomponent = true) {
|
||||
dir(reportsubfolder) {
|
||||
String recordlist = ""
|
||||
String recordlist = "${title}\n"
|
||||
for (dr in differencerecords) {
|
||||
recordlist += dr.dump() + "\n\n"
|
||||
}
|
||||
|
|
@ -545,7 +545,7 @@ def differencerecordsreport(String reportsubfolder, differencerecords, boolean i
|
|||
}
|
||||
}
|
||||
|
||||
def boolean report(meta, differencerecords, boolean iscomponent = true) {
|
||||
def boolean report(meta, title, differencerecords, boolean iscomponent = true) {
|
||||
def Map ticketed = [:]
|
||||
def Map merges = [:]
|
||||
def Map reverts = [:]
|
||||
|
|
@ -664,12 +664,24 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) {
|
|||
} else {
|
||||
reportsubfolder = "${reportfolder}/Combined"
|
||||
}
|
||||
mergereport(reportsubfolder, merges, iscomponent)
|
||||
revertsreport(reportsubfolder, reverts, iscomponent)
|
||||
ticketedreport(reportsubfolder, ticketed, iscomponent)
|
||||
unticketedreport(reportsubfolder, unticketed, iscomponent)
|
||||
ticketsreport(reportsubfolder, tickets, iscomponent)
|
||||
differencerecordsreport(reportsubfolder, differencerecords, iscomponent)
|
||||
mergereport(reportsubfolder, title, merges, iscomponent)
|
||||
revertsreport(reportsubfolder, title, reverts, iscomponent)
|
||||
ticketedreport(reportsubfolder, title, ticketed, iscomponent)
|
||||
unticketedreport(reportsubfolder, title, unticketed, iscomponent)
|
||||
ticketsreport(reportsubfolder, title, tickets, iscomponent)
|
||||
differencerecordsreport(reportsubfolder, title, differencerecords, iscomponent)
|
||||
}
|
||||
|
||||
String def title(earlymeta, latermeta) {
|
||||
return """
|
||||
Differences in:
|
||||
Product: ${earlymeta.productinfo.productname} Subcomponent: ${earlymeta.productinfo.subcomponentname}
|
||||
between:
|
||||
then:
|
||||
Build date: ${earlymeta.jenkinsbuildinfo.builddate} Build stamp: ${earlymeta.buildstampinfo.buildstamp} Git revision: ${earlymeta.gitinfo.gitrevision}
|
||||
now:
|
||||
Build date: ${latermeta.jenkinsbuildinfo.builddate} Build stamp: ${latermeta.buildstampinfo.buildstamp} Git revision: ${latermeta.gitinfo.gitrevision}
|
||||
"""
|
||||
}
|
||||
|
||||
def compare(earlymetaitems, latermetaitems, key) {
|
||||
|
|
@ -690,7 +702,7 @@ def compare(earlymetaitems, latermetaitems, key) {
|
|||
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
|
||||
|
||||
summaryappend(" Items: ${differencerecords.size()} ")
|
||||
report(earlymeta, differencerecords)
|
||||
report(earlymeta, title(earlymeta, latermeta), differencerecords)
|
||||
} else {
|
||||
summaryappend(" No source repo ")
|
||||
}
|
||||
|
|
@ -737,7 +749,7 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
|
|||
summaryappend("\n")
|
||||
}
|
||||
}
|
||||
report(meta, differencerecords, false)
|
||||
report(meta, title(earlymeta, latermeta), differencerecords, false)
|
||||
return [summarystring, markunstable, unstablereason]
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue