Refactor groovy calling test script using newer common script apis; Capture build parameters
This commit is contained in:
parent
0c350d8958
commit
ea94dfa39e
2 changed files with 70 additions and 12 deletions
|
|
@ -70,6 +70,19 @@ def setBuildType(meta, boolean dofullbuild = true) {
|
||||||
return doquickbuild
|
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
|
// Start up boilerplate
|
||||||
def startbuild(
|
def startbuild(
|
||||||
script,
|
script,
|
||||||
|
|
@ -88,12 +101,7 @@ def startbuild(
|
||||||
|
|
||||||
conditionalclean()
|
conditionalclean()
|
||||||
|
|
||||||
def meta = getmetafolderscript().metareset(script)
|
def meta = setupmeta(productname, subcomponentname, productvariant) {
|
||||||
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 rr = load("${commonscripts()}/release/registerrepo.groovy")
|
def rr = load("${commonscripts()}/release/registerrepo.groovy")
|
||||||
def String alteredreleaserepo = alterreleaserepo(releaserepo, productvariant)
|
def String alteredreleaserepo = alterreleaserepo(releaserepo, productvariant)
|
||||||
|
|
@ -121,11 +129,7 @@ def startnonbuild(
|
||||||
|
|
||||||
conditionalclean()
|
conditionalclean()
|
||||||
|
|
||||||
def meta = getmetafolderscript().metareset(script)
|
def meta = setupmeta("Non-build-product", "Non-build-subcomponent") {
|
||||||
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 ch = load("${commonscripts()}/configuration/configuration.groovy")
|
def ch = load("${commonscripts()}/configuration/configuration.groovy")
|
||||||
ch.registerPipelineScriptConfiguration(meta)
|
ch.registerPipelineScriptConfiguration(meta)
|
||||||
|
|
|
||||||
|
|
@ -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 {
|
class JenkinsBuildInfo extends GISJsonSerialised {
|
||||||
String buildjobname
|
String buildjobname
|
||||||
int buildnumber
|
int buildnumber
|
||||||
private String buildmachine
|
private String buildmachine
|
||||||
private String builddate
|
private String builddate
|
||||||
|
ArrayList<JenkinsBuildParameter> parameters
|
||||||
boolean isfullbuild
|
boolean isfullbuild
|
||||||
|
|
||||||
JenkinsBuildInfo(script, String buildjobname = "", int buildnumber = 0, String buildmachine = "", String builddate = "", boolean isfullbuild = true) {
|
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.buildmachine = buildmachine
|
||||||
this.builddate = builddate
|
this.builddate = builddate
|
||||||
this.isfullbuild = isfullbuild
|
this.isfullbuild = isfullbuild
|
||||||
|
parameters = new ArrayList<JenkinsBuildParameter>()
|
||||||
}
|
}
|
||||||
|
|
||||||
void set(String buildjobname, int buildnumber, String buildmachine, String builddate, boolean isfullbuild = true) {
|
void set(String buildjobname, int buildnumber, String buildmachine, String builddate, boolean isfullbuild = true) {
|
||||||
|
|
@ -176,12 +207,34 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
||||||
return isfullbuild
|
return isfullbuild
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void addParameter(String name, String value) {
|
||||||
|
def p = new JenkinsBuildParameter(script, name, value)
|
||||||
|
parameters.add(p)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
void deserialiseJson(rawmeta) {
|
void deserialiseJson(rawmeta) {
|
||||||
buildjobname = rawmeta['buildjobname']
|
buildjobname = rawmeta['buildjobname']
|
||||||
buildnumber = rawmeta['buildnumber']
|
buildnumber = rawmeta['buildnumber']
|
||||||
buildmachine = rawmeta['buildmachine']
|
buildmachine = rawmeta['buildmachine']
|
||||||
builddate = rawmeta['builddate']
|
builddate = rawmeta['builddate']
|
||||||
isfullbuild = (rawmeta['isfullbuild'] == null) ? true : rawmeta['isfullbuild']
|
isfullbuild = (rawmeta['isfullbuild'] == null) ? true : rawmeta['isfullbuild']
|
||||||
|
parameters = new ArrayList<JenkinsBuildParameter>()
|
||||||
|
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() {
|
LinkedHashMap serialisationdata() {
|
||||||
|
|
@ -190,7 +243,8 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
||||||
'buildnumber' : buildnumber,
|
'buildnumber' : buildnumber,
|
||||||
'buildmachine' : buildmachine,
|
'buildmachine' : buildmachine,
|
||||||
'builddate' : builddate,
|
'builddate' : builddate,
|
||||||
'isfullbuild' : isfullbuild
|
'isfullbuild' : isfullbuild,
|
||||||
|
'parameters' : parametersserialised(),
|
||||||
]
|
]
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue