From fe46dfeee60b3c95c6e2adf24d22ca4031fcff36 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 6 Nov 2021 17:16:29 +0000 Subject: [PATCH] Add a new meta walker and test it --- autobuilder.groovy | 2 +- meta/folder.groovy | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 1a071e5..667f89a 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -78,7 +78,7 @@ def setupmeta(script, String productname, String subcomponentname, String produc now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) for (p in params) { - meta.jenkinsbuildinfo.addParameter(p.key, p.value.toString()) + meta.jenkinsbuildinfo.addParameter(p.key, p.value) } return meta } diff --git a/meta/folder.groovy b/meta/folder.groovy index 9672294..46622cb 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -148,25 +148,29 @@ class JenkinsBuildParameter extends GISJsonSerialised { private String name private String value - JenkinsBuildParameter(script, String name = '', String value = '') { + JenkinsBuildParameter(script, String name = '', String valuetype = '', String value = '') { super(script) this.name = name + this.valuetype = valuetype this.value = value } - void set(String name, String value) { + void set(String name, String valuetype, String value) { this.name = name + this.valuetype = valuetype this.value = value } void deserialiseJson(rawmeta) { name = rawmeta['name'] + valuetype = rawmeta['valuetype'] value = rawmeta['value'] } LinkedHashMap serialisationdata() { def data = [ 'name' : name, + 'valuetype' : valuetype, 'value' : value, ] return data @@ -207,8 +211,8 @@ class JenkinsBuildInfo extends GISJsonSerialised { return isfullbuild } - void addParameter(String name, String value) { - def p = new JenkinsBuildParameter(script, name, value) + void addParameter(String name, value) { + def p = new JenkinsBuildParameter(script, name, value.getClass(), value.toString()) parameters.add(p) return p }