More infrastructure for differencing versions of component

This commit is contained in:
Dan Hawkins 2019-07-03 18:19:12 +01:00
commit d202e0bb3e
2 changed files with 18 additions and 6 deletions

View file

@ -16,6 +16,8 @@ def differences(meta, String sourcerevision, String previoussourcerevision, Stri
}
class DifferenceRecord {
def script
String productname
String subcomponentname
String jirakey
@ -25,7 +27,12 @@ class DifferenceRecord {
int type
String jiraticketinfo
DifferenceRecord() {
DifferenceRecord(script) {
this.script = script
}
def dump() {
script.echo("Difference Record:\nproductname: ${productname}\nsubcomponentname: ${subcomponentname}\njirakey: ${jirakey}\nrawdifferencetext: ${rawdifferencetext}\nsha: ${sha}\ntype: ${type}\njiraticketinfo: ${jiraticketinfo}"
}
}
@ -48,7 +55,7 @@ def List processtext(meta, String text) {
def List differencerecords = []
text.eachLine {
def DifferenceRecord dr = new DifferenceRecord()
def DifferenceRecord dr = new DifferenceRecord(this)
dr.productname = meta.productinfo.productname
dr.subcomponentname = meta.productinfo.subcomponentname

View file

@ -60,7 +60,7 @@ def String getcomponent(meta) {
return uniquefolderforsourcerepo
}
def boolean compare(earlymetaitems, latermetaitems, key) {
def compare(earlymetaitems, latermetaitems, key) {
boolean result = true;
echo "Collecting changes between early and later versions of component: ${key}"
@ -72,7 +72,7 @@ def boolean compare(earlymetaitems, latermetaitems, key) {
def differencer = load("${autobuilder.commonscripts()}/differences/do.groovy")
(result, differencerecords) = differencer.getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
return result;
return [result, differencerecords];
}
def deletedcomponent(earlymetaitems, key) {
@ -84,6 +84,8 @@ def addedcomponent(latermetaitems, key) {
}
def comparehierarchy(meta, String earlymetafolder, String latermetafolder, String maxdepth, String summaryfolder) {
def List differencerecords = []
def int md = maxdepth.toInteger()
resetfolders()
preconditions()
@ -108,7 +110,8 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
for (key in earlymetaitems.keySet()) {
if (latermetaitems.containsKey(key)) {
compare(earlymetaitems, latermetaitems, key)
(result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key)
differencerecords = differencerecords + componentdifferencerecords
} else {
deletedcomponent(earlymetaitems, key)
}
@ -118,7 +121,9 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
addedcomponent(latermetaitems, key)
}
}
for (record in differencerecords) {
record.dump()
}
return [summarystring, markunstable, unstablereason]
}