Merge commit '18887c9e6d'
This commit is contained in:
commit
746798de58
3 changed files with 32 additions and 10 deletions
|
|
@ -26,6 +26,8 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob
|
|||
|
||||
conditionalclean()
|
||||
|
||||
lineendings = load("${commonscriptsroot}/platform/lineendings.groovy")
|
||||
|
||||
def ch = load("${commonscriptsroot}/configuration/configuration.groovy")
|
||||
ch.registerPipelineScriptConfiguration()
|
||||
}
|
||||
|
|
@ -42,4 +44,4 @@ def configurationhelper() {
|
|||
return load("${commonscripts()}/configuration/configuration.groovy")
|
||||
}
|
||||
|
||||
return this;
|
||||
return this;
|
||||
|
|
|
|||
5
platform/lineendings.groovy
Normal file
5
platform/lineendings.groovy
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
// Put ${nl} into strings when wanting a newline
|
||||
nl = System.properties['line.separator']
|
||||
|
||||
return this;
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy")
|
||||
|
||||
def currentContents(file, newline = "\n", defaultContents = "") {
|
||||
if (fileExists("${file}")) {
|
||||
contents = readFile(file: "${file}").trim() + newline
|
||||
|
|
@ -9,7 +11,19 @@ def currentContents(file, newline = "\n", defaultContents = "") {
|
|||
return contents
|
||||
}
|
||||
|
||||
def mergemeta(versionFolder, outputFolder) {
|
||||
def prefixline(rootpath, filepath) {
|
||||
def fileContents = readFile("${filepath}").trim()
|
||||
def fileContentsNormalized = fileContents.normalize()
|
||||
|
||||
def newFileContents = ""
|
||||
def lines = fileContentsNormalized.readLines()
|
||||
for (aline in lines) {
|
||||
newFileContents += "${rootpath}" + "/" + aline + "${nl}"
|
||||
}
|
||||
return newFileContents
|
||||
}
|
||||
|
||||
def mergemeta(rootpath, versionFolder, outputFolder) {
|
||||
echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}"
|
||||
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
|
|
@ -18,7 +32,7 @@ def mergemeta(versionFolder, outputFolder) {
|
|||
writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + newContents
|
||||
|
||||
buildStampFile = "${versionFolder}/buildstamps.txt"
|
||||
buildStampFileContents = readFile("${buildStampFile}").trim()
|
||||
buildStampFileContents = prefixline(rootpath, "${buildStampFile}")
|
||||
metabuildStampFile = "${outputFolder}/buildstamps.txt"
|
||||
writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + buildStampFileContents
|
||||
|
||||
|
|
@ -34,7 +48,7 @@ def mergemeta(versionFolder, outputFolder) {
|
|||
return intrevision
|
||||
}
|
||||
|
||||
def appendcomponentinfo(versionFolder, outputFolder) {
|
||||
def appendcomponentinfo(rootpath, versionFolder, outputFolder) {
|
||||
echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}"
|
||||
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
|
|
@ -44,7 +58,7 @@ def appendcomponentinfo(versionFolder, outputFolder) {
|
|||
writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents
|
||||
}
|
||||
|
||||
buildStampFile = "${versionFolder}/buildstamp.txt"
|
||||
buildStampFile = "${versionFolder}/buildstamps.txt"
|
||||
buildStampFileContents = readFile("${buildStampFile}").trim()
|
||||
|
||||
remoteurlFile = "${versionFolder}/remoteurl.txt"
|
||||
|
|
@ -57,7 +71,7 @@ def appendcomponentinfo(versionFolder, outputFolder) {
|
|||
releaseJobNameContents = currentContents("${releaseJobNameFile}", "", "-").trim()
|
||||
|
||||
metabuildStampFile = "${outputFolder}/buildstamps.txt"
|
||||
writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents
|
||||
writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents
|
||||
revision = readFile("${versionFolder}/revision.txt").trim()
|
||||
intrevision = revision.toInteger()
|
||||
echo "Revision read in: ${intrevision}"
|
||||
|
|
@ -67,20 +81,21 @@ def appendcomponentinfo(versionFolder, outputFolder) {
|
|||
|
||||
// Each version folder should have been created using version creation scripts in this Common_scripts folder
|
||||
// as their are well-known files in each folder
|
||||
def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = "${WORKSPACE}/metaversion") {
|
||||
def combineSubjobVersions(versionLabelPrefix, artifactList, outputFolder = "${WORKSPACE}/metaversion") {
|
||||
totalrevision = 0
|
||||
dir("${outputFolder}") {
|
||||
deleteDir()
|
||||
}
|
||||
for (versionFolder in versionFolderList) {
|
||||
for (artifactItem in artifactList) {
|
||||
(rootpath, versionFolder) = artifactItem
|
||||
echo "Inspecting folder: ${versionFolder}"
|
||||
metaversionsignaturefile = "${versionFolder}/metaversion.txt"
|
||||
// If the sub project is a meta job
|
||||
if (fileExists("${metaversionsignaturefile}")) {
|
||||
intrevision = mergemeta("${versionFolder}", outputFolder)
|
||||
intrevision = mergemeta(rootpath, versionFolder, outputFolder)
|
||||
}
|
||||
else {
|
||||
intrevision = appendcomponentinfo("${versionFolder}", outputFolder)
|
||||
intrevision = appendcomponentinfo(rootpath, versionFolder, outputFolder)
|
||||
}
|
||||
totalrevision += intrevision
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue