From ea94dfa39e9b2c2c509c971fe86ee2999427f36f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 5 Nov 2021 19:52:17 +0000 Subject: [PATCH] Refactor groovy calling test script using newer common script apis; Capture build parameters --- autobuilder.groovy | 26 ++++++++++++--------- meta/folder.groovy | 56 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index 2c6c4c4..59d1448 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -70,6 +70,19 @@ def setBuildType(meta, boolean dofullbuild = true) { return doquickbuild } +def setupmeta(String productname, String subcomponentname, String productvariant = '') { + def meta = getmetafolderscript().metareset(script) + echo "Product name: ${productname} Subcomponent name: ${subcomponentname} Variant: ${productvariant}" + meta.productinfo.set(productname, subcomponentname, productvariant) + def now = new Date() + 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) + } + return meta +} + // Start up boilerplate def startbuild( script, @@ -88,12 +101,7 @@ def startbuild( conditionalclean() - def meta = getmetafolderscript().metareset(script) - echo "Product name: ${productname} Subcomponent name: ${subcomponentname}" - meta.productinfo.set(productname, subcomponentname, productvariant) - def now = new Date() - now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) - meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) + def meta = setupmeta(productname, subcomponentname, productvariant) { def rr = load("${commonscripts()}/release/registerrepo.groovy") def String alteredreleaserepo = alterreleaserepo(releaserepo, productvariant) @@ -121,11 +129,7 @@ def startnonbuild( conditionalclean() - def meta = getmetafolderscript().metareset(script) - meta.productinfo.set("Non-build-product", "Non-build-subcomponent") - def now = new Date() - now.format("yyMMdd.HHmm", TimeZone.getTimeZone('UTC')) - meta.jenkinsbuildinfo.set(JOB_NAME, BUILD_ID.toInteger(), NODE_NAME, now.toString()) + def meta = setupmeta("Non-build-product", "Non-build-subcomponent") { def ch = load("${commonscripts()}/configuration/configuration.groovy") ch.registerPipelineScriptConfiguration(meta) diff --git a/meta/folder.groovy b/meta/folder.groovy index 7a85338..e2b3015 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -144,11 +144,41 @@ class GitInfo extends GISJsonSerialised { } } +class JenkinsBuildParameter extends GISJsonSerialised { + private String name + private String value + + JenkinsBuildParameter(script, String name = '', String value = '') { + super(script) + this.name = name + this.value = value + } + + void set(String name, String value) { + this.name = name + this.value = value + } + + void deserialiseJson(rawmeta) { + name = rawmeta['name'] + value = rawmeta['value'] + } + + LinkedHashMap serialisationdata() { + def data = [ + 'name' : name, + 'value' : value, + ] + return data + } +} + class JenkinsBuildInfo extends GISJsonSerialised { String buildjobname int buildnumber private String buildmachine private String builddate + ArrayList parameters boolean isfullbuild JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "", boolean isfullbuild = true) { @@ -158,6 +188,7 @@ class JenkinsBuildInfo extends GISJsonSerialised { this.buildmachine = buildmachine this.builddate = builddate this.isfullbuild = isfullbuild + parameters = new ArrayList() } void set(String buildjobname, int buildnumber, String buildmachine, String builddate, boolean isfullbuild = true) { @@ -176,12 +207,34 @@ class JenkinsBuildInfo extends GISJsonSerialised { return isfullbuild } + void addParameter(String name, String value) { + def p = new JenkinsBuildParameter(script, name, value) + parameters.add(p) + return p + } + void deserialiseJson(rawmeta) { buildjobname = rawmeta['buildjobname'] buildnumber = rawmeta['buildnumber'] buildmachine = rawmeta['buildmachine'] builddate = rawmeta['builddate'] isfullbuild = (rawmeta['isfullbuild'] == null) ? true : rawmeta['isfullbuild'] + parameters = new ArrayList() + if (rawmeta['isfullbuild'] != null) { + for (rawparameter in rawmeta['parameters']) { + def p = new JenkinsBuildParameter(script) + p.deserialiseJson(rawparameter) + parameters.add(p) + } + } + } + + List parametersserialised() { + def associated = [] + for (p in parameters) { + associated.add(p.serialisationdata()) + } + return associated } LinkedHashMap serialisationdata() { @@ -190,7 +243,8 @@ class JenkinsBuildInfo extends GISJsonSerialised { 'buildnumber' : buildnumber, 'buildmachine' : buildmachine, 'builddate' : builddate, - 'isfullbuild' : isfullbuild + 'isfullbuild' : isfullbuild, + 'parameters' : parametersserialised(), ] return data }