Create a meta folder seperate from other artifacts

This commit is contained in:
Dan Hawkins 2018-11-18 15:16:23 +00:00
commit b06a9fd8c1
4 changed files with 19 additions and 49 deletions

View file

@ -2,50 +2,19 @@
metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy")
env.CHECKSUMARTIFACTS = "${metafolder.METAFOLDERNAME}/checksums/**"
// SHA256SUM environment variable must be set to sha256sum utility
// Generate a checksum file of from a list of files/directories relative to workspace
def generatelist(checksummable) {
def sha256sumfound = false
if (env.SHA256SUM) {
if (fileExists("${SHA256SUM}")) {
sha256sumfound = true
}
}
if (!sha256sumfound)
{
if (isUnix()) {
def sha256sumpath = sh(returnStdout: true, script: 'which sha256sum').trim()
if (sha256sumpath) {
echo "Found sha256sum executable here: ${sha256sumpath}"
env.SHA256SUM = sha256sumpath
sha256sumfound = true
}
}
}
if (!sha256sumfound) {
error "Please define the path to a sha256sum utility in the SHA256SUM environment variable"
}
def CHECKSUMFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/checksums"
sh """
rm -rf "${CHECKSUMFOLDER}"
mkdir -p "${CHECKSUMFOLDER}"
"""
sums = ""
for (filepath in checksummable) {
echo "Checksumming ${filepath}"
def files = findFiles(glob: filepath)
for (file in files) {
if (isUnix()) {
sh """#!/bin/bash
"${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list"
"""
}
else {
bat """
"${SHA256SUM}" "${file.path}" >> "${CHECKSUMFOLDER}/sha256sum_list"
"""
}
def sum = sha1(file: file.path)
echo "Sum from file ${file.path} is ${sum}"
sums += "${sum}${nl}"
}
}
writeFile(file: "${CHECKSUMFOLDER}/sha1sumlist.txt", text: sums)
}
return this;

View file

@ -2,17 +2,17 @@
metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy")
env.DIFFERENCEARTIFACTS = "${metafolder.METAFOLDERNAME}/differences/**"
def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, versionfolder = "${WORKSPACE}/version") {
def differences(sourcerevision, previoussourcerevision, sourcepath, jirakey, difffolder = "${DIFFERENCEARTIFACTS}") {
cs = autobuilder.commonscripts()
if (isUnix()) {
sh """
"${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" -d "${difffolder}"
"""
}
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" -d "${difffolder}"
"""
}
}

View file

@ -29,9 +29,9 @@ class GitException(Exception):
def __repr__(self):
return self.message
def makeFolder(versionfolder):
print("Creating folder (if not already there): {0}".format(versionfolder))
os.makedirs(versionfolder, exist_ok = True)
def makeFolder(difffolder):
print("Creating folder (if not already there): {0}".format(difffolder))
os.makedirs(difffolder, exist_ok = True)
def printDivider(outfh, times = 1, length = 100):
for _ in range(times):
@ -172,7 +172,7 @@ USAGE
parser.add_argument("-p", "--previousversion", dest="previousversion", action="store", default="origin/master", help="source branch or tag to compare with [default: %(default)s]")
parser.add_argument("-j", "--jirakeyprefix", dest="jirakeyprefix", action="store", default="GIS", help="jira key prefix [default: %(default)s]")
parser.add_argument("-o", "--outputoptions", dest="outputoptions", action="store", default="", help="output options: Can be: opposite notcommon [default: %(default)s]")
parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="", help="version folder where differences file stored [default: %(default)s]")
parser.add_argument("-d", "--difffolder", dest="difffolder", action="store", default="", help="folder where differences file stored [default: %(default)s]")
# Process arguments
args = parser.parse_args()
@ -183,14 +183,14 @@ USAGE
previousversion = args.previousversion
jirakeyprefix = args.jirakeyprefix
outputoptions = args.outputoptions
versionfolder = args.versionfolder
difffolder = args.difffolder
print("Git root:", gitrootfolder, "Source version:", sourceversion, "Previous source version:", previousversion)
print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", versionfolder)
print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", difffolder)
if versionfolder:
makeFolder(versionfolder)
outfh = open(os.path.join(versionfolder, "differences.txt"), 'w')
if difffolder:
makeFolder(difffolder)
outfh = open(os.path.join(difffolder, "differences.txt"), 'w')
else:
outfh = sys.stdout
@ -209,7 +209,7 @@ USAGE
gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion, tripledot = True)
showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
if versionfolder:
if difffolder:
outfh.close()
return 0
except Exception as e:

View file

@ -1,5 +1,6 @@
METAFOLDERNAME = "meta"
env.METAARTIFACTS = "${METAFOLDERNAME}/**"
def metareset() {
echo "Resetting meta folder"