Start using meta info for storing configuration

This commit is contained in:
Dan Hawkins 2018-11-20 20:25:33 +00:00
commit e3942ba1fe
4 changed files with 57 additions and 40 deletions

View file

@ -4,6 +4,8 @@ autobuildroot = "${WORKSPACE}/autobuild"
commonscriptsroot = "${autobuildroot}/Common_scripts"
metafolder = load("${commonscripts()}/meta/folder.groovy")
def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") {
if (doclean) {
echo "Cleaning workspace"
@ -26,7 +28,7 @@ def getautobuildpath() {
}
// Start up boilderplate
def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) {
MetaInfo start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NAME, jirakey = JIRA_KEY, autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot) {
echo "Starting...."
autobuildroot = autobuildpath
@ -34,12 +36,13 @@ def start(script, productname = PRODUCT_NAME, subcomponentname = SUBCOMPONENT_NA
conditionalclean()
def metafolder = load("${commonscripts()}/meta/folder.groovy")
metafolder.metareset(script)
metafolder.theMetaData.productinfo.set(productname, subcomponentname, jirakey)
def meta = metafolder.metareset(script)
meta.productinfo.set(productname, subcomponentname, jirakey)
def ch = load("${commonscripts()}/configuration/configuration.groovy")
ch.registerPipelineScriptConfiguration()
ch.registerPipelineScriptConfiguration(meta)
return meta
}
def configurationhelper() {

View file

@ -1,37 +1,16 @@
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
configurationCollection = [:]
def registerConfigurationInfo(String configurationName, String configurationURL, String configurationVersion, String configurationSHA) {
def ConfigurationInfo = [configurationURL, configurationVersion, configurationSHA]
configurationCollection.put(configurationName, ConfigurationInfo)
def registerConfigurationInfo(meta, String configurationName, String configurationURL, String configurationVersion, String configurationSHA) {
meta.addConfigurationInfo(configurationName, configurationURL, configurationVersion, configurationSHA)
}
def registerPipelineScriptConfiguration() {
registerConfigurationInfo('pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}"))
def registerPipelineScriptConfiguration(meta) {
registerConfigurationInfo(meta, 'pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}"))
}
def saveConfigurationInVersionInfo() {
dir("${WORKSPACE}/version") {
echo "Writing configuration info to ${WORKSPACE}/version/configuration.txt"
writeFile file: 'configuration.txt', text: getFormattedConfiguration()
}
}
String getFormattedConfiguration() {
String formattedInfo = ""
def keys = configurationCollection.keySet().sort()
for (key in keys) {
(configurationURL, configurationVersion, configurationSHA) = configurationCollection.get(key)
formattedLine = String.format("%s:%s,%s,%s%n", key, configurationURL, configurationVersion, configurationSHA)
formattedInfo += formattedLine
}
return formattedInfo
}
def gitCheckoutAndRegister(String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) {
def gitCheckoutAndRegister(meta, String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true) {
gh.gitCheckout(gitURL, revision, targetDir, repoRoot, cloneDepth, shallowClone)
registerConfigurationInfo(tool, gitURL, revision, gh.getGitInfo(targetDir))
registerConfigurationInfo(meta, tool, gitURL, revision, gh.getGitInfo(targetDir))
}
return this

View file

@ -139,6 +139,31 @@ class ReleaseInfo extends GISJsonSerialised {
}
}
class ConfigurationInfo extends GISJsonSerialised {
private String configurationname
private String configurationURL
private String configurationversion
private String configurationSHA
ConfigurationInfo(script, configurationname = "", configurationURL = "", configurationversion = "", configurationSHA = "") {
super(script)
this.configurationname = configurationname
this.configurationURL = configurationURL
this.configurationversion = configurationversion
this.configurationSHA = configurationSHA
}
LinkedHashMap serialisationdata() {
def data = [
'configurationname' : configurationname,
'configurationURL' : configurationURL,
'configurationversion' : configurationversion,
'configurationSHA' : configurationSHA,
]
return data
}
}
class MetaInfo extends GISJsonSerialised {
private String format = '0.1'
ProductInfo productinfo
@ -146,7 +171,7 @@ class MetaInfo extends GISJsonSerialised {
JenkinsBuildInfo jenkinsbuildinfo
BuildStampInfo buildstampinfo
ReleaseInfo releaseinfo
private ArrayList<ConfigurationInfo> configurationinfo
private ArrayList<MetaInfo> associatedmeta
MetaInfo(script) {
@ -156,9 +181,23 @@ class MetaInfo extends GISJsonSerialised {
jenkinsbuildinfo = new JenkinsBuildInfo(script)
buildstampinfo = new BuildStampInfo(script)
releaseinfo = new ReleaseInfo(script)
configurationinfo = new ArrayList<ConfigurationInfo>()
associatedmeta = new ArrayList<MetaInfo>()
}
List configurationinfoserialised() {
def configuration = []
for (configurationitem in configurationinfo) {
configuration.add(configurationitem.serialisationdata())
}
return associated
}
void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) {
ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA)
configurationinfo.add(ci)
}
List associatedmetaserialised() {
def associated = []
for (metaitem in associatedmeta) {
@ -179,6 +218,7 @@ class MetaInfo extends GISJsonSerialised {
'jenkinsbuildinfo' : jenkinsbuildinfo.serialisationdata(),
'buildstampinfo' : buildstampinfo.serialisationdata(),
'releaseinfo' : releaseinfo.serialisationdata(),
'configuration' : configurationinfoserialised(),
'associatedmeta' : associatedmetaserialised(),
]
return data
@ -189,14 +229,12 @@ class MetaInfo extends GISJsonSerialised {
}
}
MetaInfo theMetaData = new MetaInfo(this)
def metareset(script) {
MetaInfo metareset(script) {
echo "Resetting meta folder"
dir("${WORKSPACE}/${METAFOLDERNAME}") {
deleteDir()
}
theMetaData = new MetaInfo(this)
return new MetaInfo(script)
}
return this;

View file

@ -17,9 +17,6 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam
env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim()
env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim()
env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim()
def ch = load("${cs}/configuration/configuration.groovy")
ch.saveConfigurationInVersionInfo();
}
return this;