This commit is contained in:
Dan Hawkins 2018-10-31 20:31:40 +00:00
commit 6546190a3d

View file

@ -28,27 +28,27 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder =
if (fileExists("${differencesFile}")) {
currentContents = readFile file: "${OF}/differences.txt"
newContents = readFile file: "${differencesFile}"
writeFile file: "${OF}/differences.txt", text: currentContents + "${differencesFile}: \n" + newContents
breakline = "***********************************************************************\n"
writeFile file: "${OF}/differences.txt", text: currentContents + breakline + "${differencesFile}: \n" + newContents
}
buildStampFile = "${versionFolder}/buildstamp.txt"
buildStampFileContents = readFile "${buildStampFile}"
buildStampFileContents = readFile("${buildStampFile}").trim()
remoteurlFile = "${versionFolder}/remoteurl.txt"
if (fileExists("${remoteurlFile}")) {
remoteurlFileContents = readFile "${remoteurlFile}"
remoteurlFileContents = readFile("${remoteurlFile}").trim()
}
else {
remoteurlFileContents = 'Unknown'
}
gitRevisionFile = "${versionFolder}/gitrevision.txt"
gitRevisionFileContents = readFile "${gitRevisionFile}"
gitRevisionFileContents = readFile("${gitRevisionFile}").trim()
metabuildStampFile = "${OF}/buildstamps.txt"
metabuildStampFileContents = readFile "${metabuildStampFile}"
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}"