Merge commit '09a1c4fa50'
This commit is contained in:
commit
2871526615
4 changed files with 7 additions and 6 deletions
|
|
@ -26,8 +26,8 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob
|
|||
|
||||
conditionalclean()
|
||||
|
||||
configurationhelper = load("${commonscriptsroot}/configuration/configuration.groovy")
|
||||
configurationhelper.registerPipelineScriptConfiguration()
|
||||
def ch = load("${commonscriptsroot}/configuration/configuration.groovy")
|
||||
ch.registerPipelineScriptConfiguration()
|
||||
}
|
||||
|
||||
def commonscripts() {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, ver
|
|||
}
|
||||
else {
|
||||
bat """
|
||||
"%${PYTHON}%" -u "%${cs}%\\differences\\show_release_differences.py" -g "%${sourcepath}%" -s "%${sourcerevision}%" -p "%${previoussourcerevision}%" -j ${jirakey} -o "opposite notcommon" -v "%${versionfolder}%"
|
||||
"${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -v "${versionfolder}"
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ def artifactsImporter(artifactDetails, installerDetails) {
|
|||
echo "Copying from: ${folderToCopy} to: ${componentVersionFolder}"
|
||||
fileOperations([folderCopyOperation(destinationFolderPath: componentVersionFolder, sourceFolderPath: folderToCopy)])
|
||||
//fileOperations([fileCopyOperation(excludes: '', flattenFiles: false, includes: filesToCopy, targetLocation: componentVersionFolder )])
|
||||
artifactVersion = githelper.getSHAFromVersion("${destFolder}/version")
|
||||
def gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
|
||||
artifactVersion = gh.getSHAFromVersion("${destFolder}/version")
|
||||
artifactFetched.put(artifactKey, artifactVersion)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam
|
|||
}
|
||||
else {
|
||||
bat """
|
||||
"%${PYTHON}%" -u "%${cs}%\\versionnumbering\\versioninfo.py" -s "%${sourcerevision}%" -v "${versionfolder}" -g "${sourcepath}" -b %${basebuildnumber}% -j "%${jobname}%" -n "%${buildid}%" -r "%${releasejobname}%"
|
||||
"${PYTHON}" -u "${cs}\\versionnumbering\\versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}"
|
||||
"""
|
||||
}
|
||||
env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim()
|
||||
|
|
@ -17,4 +17,4 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam
|
|||
configurationhelper.saveConfigurationInVersionInfo();
|
||||
}
|
||||
|
||||
return this;
|
||||
return this;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue