Add more difference infrastructure

This commit is contained in:
Dan Hawkins 2019-07-03 19:34:26 +01:00
commit 02b104312d
2 changed files with 102 additions and 79 deletions

View file

@ -15,79 +15,4 @@ def differences(meta, String sourcerevision, String previoussourcerevision, Stri
}
}
class DifferenceRecord {
String productname
String subcomponentname
String jirakey
String rawdifferencetext
String sha
int type
String jiraticketinfo
DifferenceRecord() {
}
def String dump() {
return "Difference Record:\nproductname: ${productname}\nsubcomponentname: ${subcomponentname}\njirakey: ${jirakey}\nrawdifferencetext: ${rawdifferencetext}\nsha: ${sha}\ntype: ${type}\njiraticketinfo: ${jiraticketinfo}"
}
}
def getgitlogdifferences(String gitrootfolder, String earlyrevision, String laterrevision, boolean tripledot = false) {
def differencerecords = []
def String releaseexpression
if (tripledot) {
releaseexpression = earlyrevision + "..." + laterrevision
} else {
releaseexpression = earlyrevision + ".." + laterrevision
}
def String differencetext
dir(gitrootfolder) {
differencetext = sh(returnStdout: true, script: "git log --oneline ${releaseexpression}").trim()
}
return differencetext
}
def List processtext(meta, String text) {
def List differencerecords = []
text.eachLine {
def DifferenceRecord dr = new DifferenceRecord()
dr.productname = meta.productinfo.productname
dr.subcomponentname = meta.productinfo.subcomponentname
dr.jirakey = meta.productinfo.jirakey
dr.rawdifferencetext = it.trim()
dr.sha = "sha"
dr.type = 0
dr.jiraticketinfo = "info"
differencerecords.add(dr)
}
return differencerecords
}
def getdifferencerecords(earlymeta, latermeta, String sourcepath) {
boolean result = true;
def List differencerecords = []
def earlygitinfo = earlymeta.gitinfo
def latergitinfo = latermeta.gitinfo
if (earlygitinfo.remoteurl == latergitinfo.remoteurl) {
def earlyrevision = earlygitinfo.gitrevision
def laterrevision = latergitinfo.gitrevision
echo "Comparing early revision: ${earlyrevision} with: ${laterrevision} Working copy path: ${sourcepath}"
def String differencetext = getgitlogdifferences(sourcepath, earlyrevision, laterrevision)
echo "Difference text is:\n${differencetext}"
differencerecords = differencerecords + processtext(earlymeta, differencetext)
} else {
echo "The early and later git urls don't match"
result = false;
}
return [result, differencerecords]
}
return this;

View file

@ -8,6 +8,24 @@ summarystring = ""
sourcerepofolder = "${WORKSPACE}/sourcerepos"
tempfolder = "${WORKSPACE}/temp"
class DifferenceRecord {
String productname
String subcomponentname
String jirakey
String rawdifferencetext
String sha
int type
String jiraticketinfo
DifferenceRecord() {
}
def String dump() {
return "Difference Record:\nproductname: ${productname}\nsubcomponentname: ${subcomponentname}\njirakey: ${jirakey}\nrawdifferencetext: ${rawdifferencetext}\nsha: ${sha}\ntype: ${type}\njiraticketinfo: ${jiraticketinfo}"
}
}
def resetfolders() {
dir(summaryfolder) {
deleteDir()
@ -46,6 +64,31 @@ def showmetaitems(metaitems) {
echo info
}
def checkoutsourcerepo(buildmeta, String checkoutfolder) {
def String sourcerepo = buildmeta.gitinfo.remoteurl
if (sourcerepo) {
// Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component
if (fileExists(checkoutfolder)) {
dir(checkoutfolder) {
sh("""
git reset --hard
git clean -fdx
git pull
# Remove all tags that are not already on the remote
git tag -l | xargs git tag -d >/dev/null
git fetch -t >/dev/null
"""
)
}
}
else {
dir(sourcerepofolder) {
sh("git clone ${sourcerepo} ${checkoutfolder}")
}
}
}
}
def String getcomponent(meta) {
def String uniquefolder = "${meta.productinfo.productname}_${meta.productinfo.subcomponentname}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
@ -53,13 +96,69 @@ def String getcomponent(meta) {
summaryappend("${meta.productinfo.productname} ${meta.productinfo.subcomponentname}: ")
def releaser = load("${autobuilder.commonscripts()}/release/do.groovy")
releaser.checkoutsourcerepo(meta, uniquefolderforsourcerepo)
checkoutsourcerepo(meta, uniquefolderforsourcerepo)
summaryappend("\n")
return uniquefolderforsourcerepo
}
def getgitlogdifferences(String gitrootfolder, String earlyrevision, String laterrevision, boolean tripledot = false) {
def differencerecords = []
def String releaseexpression
if (tripledot) {
releaseexpression = earlyrevision + "..." + laterrevision
} else {
releaseexpression = earlyrevision + ".." + laterrevision
}
def String differencetext
dir(gitrootfolder) {
differencetext = sh(returnStdout: true, script: "git log --oneline ${releaseexpression}").trim()
}
return differencetext
}
def List processtext(meta, String text) {
def List differencerecords = []
text.eachLine {
def DifferenceRecord dr = new DifferenceRecord()
dr.productname = meta.productinfo.productname
dr.subcomponentname = meta.productinfo.subcomponentname
dr.jirakey = meta.productinfo.jirakey
dr.rawdifferencetext = it.trim()
dr.sha = "sha"
dr.type = 0
dr.jiraticketinfo = "info"
differencerecords.add(dr)
}
return differencerecords
}
def getdifferencerecords(earlymeta, latermeta, String sourcepath) {
boolean result = true;
def List differencerecords = []
def earlygitinfo = earlymeta.gitinfo
def latergitinfo = latermeta.gitinfo
if (earlygitinfo.remoteurl == latergitinfo.remoteurl) {
def earlyrevision = earlygitinfo.gitrevision
def laterrevision = latergitinfo.gitrevision
echo "Comparing early revision: ${earlyrevision} with: ${laterrevision} Working copy path: ${sourcepath}"
def String differencetext = getgitlogdifferences(sourcepath, earlyrevision, laterrevision)
echo "Difference text is:\n${differencetext}"
differencerecords = processtext(earlymeta, differencetext)
} else {
echo "The early and later git urls don't match"
result = false;
}
return [result, differencerecords]
}
def compare(earlymetaitems, latermetaitems, key) {
boolean result = true;
echo "Collecting changes between early and later versions of component: ${key}"
@ -69,8 +168,7 @@ def compare(earlymetaitems, latermetaitems, key) {
def uniquefolderforsourcerepo = getcomponent(earlymeta)
def differencer = load("${autobuilder.commonscripts()}/differences/do.groovy")
(result, differencerecords) = differencer.getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
return [result, differencerecords];
}