Merge commit '75c7e069cc'
This commit is contained in:
commit
6546190a3d
1 changed files with 6 additions and 6 deletions
|
|
@ -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}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue