Use productvariant() instead of .productinfo.productname

This commit is contained in:
Dan Hawkins 2022-03-13 22:19:51 +00:00
commit 2ae44ffdcd
4 changed files with 18 additions and 18 deletions

View file

@ -27,7 +27,7 @@ class JiraTicketInfo {
}
class DifferenceRecord {
String productname
String productvariant
String subcomponentname
String rawdifferencetext
@ -39,7 +39,7 @@ class DifferenceRecord {
String comment
DifferenceRecord() {
productname = ""
productvariant = ""
subcomponentname = ""
rawdifferencetext = ""
@ -130,7 +130,7 @@ def boolean checkoutsourcerepo(buildmeta, String checkoutfolder) {
}
def String getcomponent(meta) {
def String uniquefolder = "${meta.productinfo.productname}_${meta.productinfo.subcomponentname}"
def String uniquefolder = "${meta.productvariant()}_${meta.productinfo.subcomponentname}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
@ -343,7 +343,7 @@ def List fillrecord(meta, line, String sourcepath) {
def List differencerecords = []
def DifferenceRecord dr = new DifferenceRecord()
dr.productname = meta.productinfo.productname
dr.productvariant = meta.productvariant()
dr.subcomponentname = meta.productinfo.subcomponentname
dr.rawdifferencetext = line
@ -755,7 +755,7 @@ def boolean report(meta, title, differencerecords, boolean iscomponent = true) {
def title(earlymeta, latermeta) {
return """
Differences in:
Product: ${earlymeta.productinfo.productname} Subcomponent: ${earlymeta.productinfo.subcomponentname}
Product: ${earlymeta.productvariant()} Subcomponent: ${earlymeta.productinfo.subcomponentname}
between:
then:
Build date: ${earlymeta.jenkinsbuildinfo.builddate} Build stamp: ${earlymeta.buildstampinfo.buildstamp} Git revision: ${earlymeta.gitinfo.gitrevision}
@ -771,7 +771,7 @@ def compare(earlymetaitems, latermetaitems, key) {
def earlymeta = earlymetaitems[key].metainfo
def latermeta = latermetaitems[key].metainfo
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: Changed: ")
summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: Changed: ")
def boolean repoavailable
def String uniquefolderforsourcerepo
@ -817,14 +817,14 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
(result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key)
differencerecords = differencerecords + componentdifferencerecords
} else {
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: ")
deletedcomponent(earlymetaitems, key)
summaryappend("\n")
}
}
for (key in latermetaitems.keySet()) {
if (!earlymetaitems.containsKey(key)) {
summaryappend("${latermeta.productinfo.productname} ${latermeta.productinfo.subcomponentname}: ")
summaryappend("${latermeta.productvariant()} ${latermeta.productinfo.subcomponentname}: ")
addedcomponent(latermetaitems, key)
summaryappend("\n")
}