Move meta data to one groovy file because of the difficulty of including/importing groovy classes
This commit is contained in:
parent
e59f3b38bc
commit
9f5a473fcf
2 changed files with 33 additions and 29 deletions
|
|
@ -36,7 +36,7 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA
|
|||
|
||||
def metafolder = load("${commonscripts()}/meta/folder.groovy")
|
||||
metafolder.metareset(script)
|
||||
metafolder.setproductinfo(productname, subcomponentname, jirakey)
|
||||
metafolder.theMetaData.productinfo.set(productname, subcomponentname, jirakey)
|
||||
|
||||
def ch = load("${commonscripts()}/configuration/configuration.groovy")
|
||||
ch.registerPipelineScriptConfiguration()
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ abstract class GISJsonSerialised implements Serializable {
|
|||
this.script = script
|
||||
}
|
||||
|
||||
abstract Map serialisationdata();
|
||||
abstract LinkedHashMap serialisationdata();
|
||||
|
||||
def saveJsonSerialised(String outputfile, int prettylevel = 4) {
|
||||
def outJson = script.readJSON text: groovy.json.JsonOutput.toJson(serialisationdata())
|
||||
|
|
@ -22,18 +22,20 @@ class ProductInfo extends GISJsonSerialised {
|
|||
private String subcomponentname
|
||||
private String jirakey
|
||||
|
||||
ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") {
|
||||
super(script)
|
||||
this.productname = productname
|
||||
this.subcomponentname = subcomponentname
|
||||
this.jirakey = jirakey
|
||||
}
|
||||
|
||||
def set(productname, subcomponentname, jirakey) {
|
||||
this.productname = productname
|
||||
this.subcomponentname = subcomponentname
|
||||
this.jirakey = jiraKey
|
||||
this.jirakey = jirakey
|
||||
}
|
||||
|
||||
ProductInfo(script, productname = "", subcomponentname = "", jirakey = "") {
|
||||
super(script)
|
||||
set(productname, subcomponentname, jirakey)
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'productname' : productname,
|
||||
'subcomponentname' : subcomponentname,
|
||||
|
|
@ -59,7 +61,7 @@ class GitInfo extends GISJsonSerialised {
|
|||
this.remoteinfo = remoteinfo
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'sourcepath' : sourcepath,
|
||||
'sourcerevision' : sourcerevision,
|
||||
|
|
@ -85,7 +87,7 @@ class JenkinsBuildInfo extends GISJsonSerialised {
|
|||
this.builddate = builddate
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'buildjobname' : buildjobname,
|
||||
'buildnumber' : buildnumber,
|
||||
|
|
@ -110,7 +112,7 @@ class BuildStampInfo extends GISJsonSerialised {
|
|||
this.buildstampcommasep = buildstampcommasep
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'buildstampprefix' : buildstampprefix,
|
||||
'revision' : revision,
|
||||
|
|
@ -129,7 +131,7 @@ class ReleaseInfo extends GISJsonSerialised {
|
|||
this.releasejobname = releasejobname
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'releasejobname' : releasejobname,
|
||||
]
|
||||
|
|
@ -138,34 +140,40 @@ class ReleaseInfo extends GISJsonSerialised {
|
|||
}
|
||||
|
||||
class MetaInfo extends GISJsonSerialised {
|
||||
private ProductInfo productinfo
|
||||
private GitInfo gitinfo
|
||||
private JenkinsBuildInfo jenkinsbuildinfo
|
||||
private BuildStampInfo buildstampinfo
|
||||
private ReleaseInfo releaseinfo
|
||||
private String format = '0.1'
|
||||
ProductInfo productinfo
|
||||
GitInfo gitinfo
|
||||
JenkinsBuildInfo jenkinsbuildinfo
|
||||
BuildStampInfo buildstampinfo
|
||||
ReleaseInfo releaseinfo
|
||||
|
||||
private MetaInfo[] associatedmeta
|
||||
private ArrayList<MetaInfo> associatedmeta
|
||||
|
||||
MetaInfo(script) {
|
||||
super(script)
|
||||
productinfo = new ProductInfo(script)
|
||||
gitinfo = new GitInfo(script)
|
||||
jenkinsbuildinfoo = new JenkinsBuildInfo(script)
|
||||
buildstampinfoo = new BuildStampInfo(script)
|
||||
releaseinfoo = new ReleaseInfo(script)
|
||||
associatedmeta = []
|
||||
jenkinsbuildinfo = new JenkinsBuildInfo(script)
|
||||
buildstampinfo = new BuildStampInfo(script)
|
||||
releaseinfo = new ReleaseInfo(script)
|
||||
associatedmeta = new ArrayList<MetaInfo>()
|
||||
}
|
||||
|
||||
List associatedmetaserialised() {
|
||||
def associated = []
|
||||
for (metaitem in associatedmeta) {
|
||||
associated.add(serialisationdata(metaitem))
|
||||
associated.add(metaitem.serialisationdata())
|
||||
}
|
||||
return associated
|
||||
}
|
||||
|
||||
Map serialisationdata() {
|
||||
void addAssociatedMetaInfo(mi) {
|
||||
associatedmeta.add(mi)
|
||||
}
|
||||
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'format' : format,
|
||||
'productinfo' : productinfo.serialisationdata(),
|
||||
'gitinfo' : gitinfo.serialisationdata(),
|
||||
'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(),
|
||||
|
|
@ -173,7 +181,7 @@ class MetaInfo extends GISJsonSerialised {
|
|||
'releaseinfo' : releaseinfo.serialisationdata(),
|
||||
'associatedmeta' : associatedmetaserialised(),
|
||||
]
|
||||
return datasetProductInfo
|
||||
return data
|
||||
}
|
||||
|
||||
def setproductinfo(productname, subcomponentname, jirakey) {
|
||||
|
|
@ -191,8 +199,4 @@ def metareset(script) {
|
|||
theMetaData = new MetaInfo(this)
|
||||
}
|
||||
|
||||
def setproductinfo(productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY) {
|
||||
theMetaData.setproductinfo(productname, subcomponentname, jirakey)
|
||||
}
|
||||
|
||||
return this;
|
||||
Loading…
Add table
Add a link
Reference in a new issue