From 28d24268fb9a78a98ac492092fe983d1a40f99ae Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 3 Jul 2019 18:29:03 +0100 Subject: [PATCH] Add more difference infrastructure --- differences/do.groovy | 6 ++---- differences/dometahierarchy.groovy | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/differences/do.groovy b/differences/do.groovy index b29aaa4..0de5395 100644 --- a/differences/do.groovy +++ b/differences/do.groovy @@ -16,8 +16,6 @@ def differences(meta, String sourcerevision, String previoussourcerevision, Stri } class DifferenceRecord { - def script - String productname String subcomponentname String jirakey @@ -31,8 +29,8 @@ class DifferenceRecord { this.script = script } - def dump() { - script.echo("Difference Record:\nproductname: ${productname}\nsubcomponentname: ${subcomponentname}\njirakey: ${jirakey}\nrawdifferencetext: ${rawdifferencetext}\nsha: ${sha}\ntype: ${type}\njiraticketinfo: ${jiraticketinfo}" + def String dump() { + return "Difference Record:\nproductname: ${productname}\nsubcomponentname: ${subcomponentname}\njirakey: ${jirakey}\nrawdifferencetext: ${rawdifferencetext}\nsha: ${sha}\ntype: ${type}\njiraticketinfo: ${jiraticketinfo}" } } diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 464dce9..2770c4a 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -122,7 +122,7 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin } } for (record in differencerecords) { - record.dump() + echo "${record.dump()}" } return [summarystring, markunstable, unstablereason] }