Merge commit '53fd4d61ce'
This commit is contained in:
commit
d9a7b45352
3 changed files with 60 additions and 12 deletions
41
install/installhelper.gsh
Normal file
41
install/installhelper.gsh
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
// Given details about artifacts to import and details of installers to build, import artifacts that are required
|
||||
def artifactsImporter(artifactDetails, installerDetails) {
|
||||
artifactFetched = [:]
|
||||
|
||||
for (installer in toBuild) {
|
||||
def artifactKey = installerDetails.get(installer)[0]
|
||||
//echo "To build: ${installer} use artifactKey: ${artifactKey}"
|
||||
(sourceProject, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey)
|
||||
env.importDest = destFolder
|
||||
if (artifactFetched.get(artifactKey) == null) {
|
||||
//echo "Artifact info: ${artifactInfo}"
|
||||
copyArtifacts excludes: notToCopy, filter: toCopy, fingerprintArtifacts: true, projectName: "${sourceProject}", selector: lastSuccessful(), target: "${destFolder}"
|
||||
def componentVersionFolder = "${WORKSPACE}\\version\\version_${artifactKey}"
|
||||
def folderToCopy = "${destFolder}\\version"
|
||||
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")
|
||||
artifactFetched.put(artifactKey, artifactVersion)
|
||||
}
|
||||
}
|
||||
return artifactFetched
|
||||
}
|
||||
|
||||
// Export any required binaries to the <WORKSPACE>/bin folder
|
||||
def exportBinaries(artifactDetails, installerDetails) {
|
||||
for (installer in toBuild) {
|
||||
(artifactSet, targetFolder, executionPath, ISMprojectFile, installerVariant, exportBinaries) = installerDetails.get(installer)
|
||||
if (exportBinaries) {
|
||||
(artifactsSourceProject, destinationFolder, artifactsToCopy, artifactsToNotCopy, binariesFolders) = artifactDetails.get(artifactSet)
|
||||
for (binaryFolder in binariesFolders) {
|
||||
binariesSourceFolder = "${destinationFolder}/${binaryFolder}"
|
||||
binariesDestFolder = "${WORKSPACE}/bin/${artifactSet}/${binaryFolder}"
|
||||
echo "Copying from: ${binariesSourceFolder} to: ${binariesDestFolder}"
|
||||
fileOperations([folderCopyOperation(destinationFolderPath: binariesDestFolder, sourceFolderPath: binariesSourceFolder)])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
@ -24,15 +24,13 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder =
|
|||
error "combineSubjobVersions script is not supported in Windows yet"
|
||||
}
|
||||
for (versionFolder in versionFolderList) {
|
||||
env.differencesFile = "${versionFolder}/differences.txt"
|
||||
sh """#!/bin/bash
|
||||
differencesFile = "${versionFolder}/differences.txt"
|
||||
if (fileExists("${differencesFile}")) {
|
||||
currentContents = readFile file: "${OF}/differences.txt"
|
||||
newContents = readFile file: "${differencesFile}"
|
||||
writeFile file: "${OF}/differences.txt", text: currentContents + "${differencesFile}: \n" + newContents
|
||||
}
|
||||
|
||||
echo ${differencesFile}: >> "${OF}/differences.txt"
|
||||
if [ \$? -ne 0 ]; then exit 1; fi
|
||||
|
||||
cat "${differencesFile}" >> "${OF}/differences.txt"
|
||||
if [ \$? -ne 0 ]; then exit 1; fi
|
||||
"""
|
||||
buildStampFile = "${versionFolder}/buildstamp.txt"
|
||||
buildStampFileContents = readFile "${buildStampFile}"
|
||||
metabuildStampFile = "${OF}/buildstamps.txt"
|
||||
|
|
|
|||
|
|
@ -64,10 +64,16 @@ def getGitRevision(gitrootpath, basenumber):
|
|||
remoteinfo = completed.stdout.decode("utf-8")
|
||||
print("Remote info: {0}".format(remoteinfo))
|
||||
|
||||
print("Determining remote url using git command: {0}".format(gitExecutable))
|
||||
completed = subprocess.run([gitExecutable, "remote", "get-url", "--push", "origin"], stdout=subprocess.PIPE)
|
||||
print("Command {0} returned: {1}".format(completed.args, completed.returncode))
|
||||
remoteurl = completed.stdout.decode("utf-8")
|
||||
print("Remote info: {0}".format(remoteurl))
|
||||
|
||||
os.chdir(cwd)
|
||||
print("Restored current working directory to: {0}".format(cwd))
|
||||
|
||||
return (adjustedchangecount, revision, remoteinfo)
|
||||
return (adjustedchangecount, revision, remoteinfo, remoteurl)
|
||||
|
||||
# Handle:
|
||||
# origin/master
|
||||
|
|
@ -132,7 +138,7 @@ def getVersionPrefix(sourcebranch):
|
|||
print("Determined version prefix to be: {0}".format(versionprefix))
|
||||
return versionprefix
|
||||
|
||||
def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp):
|
||||
def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp):
|
||||
with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f:
|
||||
f.write(buildjobname)
|
||||
|
||||
|
|
@ -148,6 +154,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou
|
|||
with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f:
|
||||
f.write(remoteinfo)
|
||||
|
||||
with open(os.path.join(versionfolder, "remoteurl.txt"), 'w') as f:
|
||||
f.write(remoteurl)
|
||||
|
||||
with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f:
|
||||
f.write(buildnumber)
|
||||
|
||||
|
|
@ -214,14 +223,14 @@ USAGE
|
|||
|
||||
resetFolder(versionfolder)
|
||||
|
||||
(gitrevisioncount, gitrevision, remoteinfo) = getGitRevision(gitrootfolder, baseversionnumber)
|
||||
(gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(gitrootfolder, baseversionnumber)
|
||||
|
||||
versionprefix = getVersionPrefix(sourcebranch)
|
||||
|
||||
buildstamp = versionprefix + str(gitrevisioncount)
|
||||
print("Build stamp is: {0}".format(buildstamp))
|
||||
|
||||
writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp)
|
||||
writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp)
|
||||
|
||||
return 0
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue