Merge commit '6c617020f1'
This commit is contained in:
commit
731de86f01
1 changed files with 72 additions and 44 deletions
|
|
@ -1,66 +1,94 @@
|
|||
|
||||
def currentContents(file, newline = "\n", defaultContents = "") {
|
||||
if (fileExists("${file}")) {
|
||||
contents = readFile(file: "${file}").trim() + newline
|
||||
}
|
||||
else {
|
||||
contents = defaultContents
|
||||
}
|
||||
return contents
|
||||
}
|
||||
|
||||
def mergemeta(versionFolder, outputFolder) {
|
||||
echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}"
|
||||
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
newContents = readFile file: "${differencesFile}"
|
||||
metadifferencesFile = "${outputFolder}/differences.txt"
|
||||
writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + newContents
|
||||
|
||||
buildStampFile = "${versionFolder}/buildstamps.txt"
|
||||
buildStampFileContents = readFile("${buildStampFile}").trim()
|
||||
metabuildStampFile = "${outputFolder}/buildstamps.txt"
|
||||
writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + buildStampFileContents
|
||||
|
||||
if (fileExists("${versionFolder}/revision.txt")) {
|
||||
revision = readFile("${versionFolder}/revision.txt").trim()
|
||||
intrevision = revision.toInteger()
|
||||
echo "Revision read in: ${intrevision}"
|
||||
}
|
||||
else {
|
||||
intrevision = 1
|
||||
}
|
||||
|
||||
return intrevision
|
||||
}
|
||||
|
||||
def appendcomponentinfo(versionFolder, outputFolder) {
|
||||
echo "Appemding component version data from folder: ${versionFolder} to ${outputFolder}"
|
||||
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
if (fileExists("${differencesFile}")) {
|
||||
newContents = readFile file: "${differencesFile}"
|
||||
metadifferencesFile = "${outputFolder}/differences.txt"
|
||||
writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents
|
||||
}
|
||||
|
||||
buildStampFile = "${versionFolder}/buildstamp.txt"
|
||||
buildStampFileContents = readFile("${buildStampFile}").trim()
|
||||
|
||||
remoteurlFile = "${versionFolder}/remoteurl.txt"
|
||||
remoteurlFileContents = currentContents(remoteurlFile. "", 'Unknown')
|
||||
|
||||
gitRevisionFile = "${versionFolder}/gitrevision.txt"
|
||||
gitRevisionFileContents = readFile("${gitRevisionFile}").trim()
|
||||
|
||||
metabuildStampFile = "${outputFolder}/buildstamps.txt"
|
||||
writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents
|
||||
revision = readFile("${versionFolder}/revision.txt").trim()
|
||||
intrevision = revision.toInteger()
|
||||
echo "Revision read in: ${intrevision}"
|
||||
|
||||
return intrevision
|
||||
}
|
||||
|
||||
// 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") {
|
||||
env.VLP = versionLabelPrefix
|
||||
env.OF = outputFolder
|
||||
totalrevision = 0
|
||||
if (isUnix()) {
|
||||
sh """#!/bin/bash
|
||||
|
||||
rm -rf "${OF}"
|
||||
mkdir -p "${OF}"
|
||||
if [ \$? -ne 0 ]; then exit 1; fi
|
||||
|
||||
touch "${OF}/differences.txt"
|
||||
if [ \$? -ne 0 ]; then exit 1; fi
|
||||
|
||||
touch "${OF}/buildstamps.txt"
|
||||
if [ \$? -ne 0 ]; then exit 1; fi
|
||||
|
||||
"""
|
||||
}
|
||||
else {
|
||||
error "combineSubjobVersions script is not supported in Windows yet"
|
||||
dir("${outputFolder}") {
|
||||
deleteDir()
|
||||
}
|
||||
for (versionFolder in versionFolderList) {
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
if (fileExists("${differencesFile}")) {
|
||||
currentContents = readFile file: "${OF}/differences.txt"
|
||||
newContents = readFile file: "${differencesFile}"
|
||||
breakline = "***********************************************************************\n"
|
||||
writeFile file: "${OF}/differences.txt", text: currentContents + breakline + "${differencesFile}: \n" + newContents
|
||||
}
|
||||
|
||||
buildStampFile = "${versionFolder}/buildstamp.txt"
|
||||
buildStampFileContents = readFile("${buildStampFile}").trim()
|
||||
|
||||
remoteurlFile = "${versionFolder}/remoteurl.txt"
|
||||
if (fileExists("${remoteurlFile}")) {
|
||||
remoteurlFileContents = readFile("${remoteurlFile}").trim()
|
||||
echo "Inspecting folder: ${versionFolder}"
|
||||
metaversionsignaturefile = "${versionFolder}/metaversion.txt"
|
||||
// If the sub project is a meta job
|
||||
if (fileExists("${metaversionsignaturefile}")) {
|
||||
intrevision = mergemeta("${versionFolder}", outputFolder)
|
||||
}
|
||||
else {
|
||||
remoteurlFileContents = 'Unknown'
|
||||
intrevision = appendcomponentinfo("${versionFolder}", outputFolder)
|
||||
}
|
||||
|
||||
gitRevisionFile = "${versionFolder}/gitrevision.txt"
|
||||
gitRevisionFileContents = readFile("${gitRevisionFile}").trim()
|
||||
|
||||
metabuildStampFile = "${OF}/buildstamps.txt"
|
||||
metabuildStampFileContents = readFile("${metabuildStampFile}")
|
||||
writeFile file: "${metabuildStampFile}", text: metabuildStampFileContents + "\r\n" + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents
|
||||
revision = readFile("${versionFolder}/revision.txt").trim()
|
||||
intrevision = revision.toInteger()
|
||||
echo "Revision read in: ${intrevision}"
|
||||
totalrevision += intrevision
|
||||
echo "Accumulated revision is: ${totalrevision}"
|
||||
}
|
||||
echo "Accumulated revision is: ${totalrevision}"
|
||||
if (versionLabelPrefix.endsWith(".")) {
|
||||
writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + totalrevision
|
||||
writeFile file: "${outputFolder}/metaversion.txt", text: versionLabelPrefix + totalrevision
|
||||
}
|
||||
else {
|
||||
writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision
|
||||
writeFile file: "${outputFolder}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision
|
||||
}
|
||||
writeFile("${outputFolder}/revision.txt", text: totalrevision)
|
||||
}
|
||||
|
||||
return this;
|
||||
Loading…
Add table
Add a link
Reference in a new issue