Merge commit '2946e8c2effe59a7cda1667e3cf1592c0bd872bc'

This commit is contained in:
Dan Hawkins 2020-01-11 23:03:21 +00:00
commit b68995a15e

View file

@ -4,6 +4,8 @@ unstablereason = ""
summaryfolder = "${WORKSPACE}/summary"
summaryfile = "${summaryfolder}/summary.txt"
summarystring = ""
repoandtagsfile = "${summaryfolder}/repoandtags.txt"
repoandtagsstring = ""
releaserepofolder = "${WORKSPACE}/releaserepos"
sourcerepofolder = "${WORKSPACE}/sourcerepos"
tempfolder = "${WORKSPACE}/temp"
@ -28,6 +30,8 @@ def preconditions() {
unstablereason = ""
summarystring = ""
writeFile(file: summaryfile, text: "Release summary: \n")
repoandtagsstring = ""
writeFile(file: repoandtagsfile, text: "Repository summary: \n")
}
def setunstable(String reason) {
@ -42,6 +46,12 @@ def summaryappend(String summary) {
summarystring += summary
}
def repoandtagsappend(String summary) {
def String repoandtagscontents = readFile(file: repoandtagsfile)
writeFile(file: repoandtagsfile, text: repoandtagscontents + summary)
repoandtagsstring += summary
}
def getpreviousreleasemeta(buildmeta, String checkoutfolder) {
def previousreleasemeta = buildmeta.getNewMetaObject(this)
// See if there is meta data file from the current release
@ -55,6 +65,7 @@ def getpreviousreleasemeta(buildmeta, String checkoutfolder) {
def checkoutreleaserepo(buildmeta, String checkoutfolder) {
def String releaserepo = buildmeta.releaseinfo.releaserepoURL
// Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta
repoandtagsappend(" Release repo: ${releaserepo}")
def previousreleasemeta = buildmeta.getNewMetaObject(this)
dir(releaserepofolder) {
sh("git clone ${releaserepo} ${checkoutfolder}")
@ -70,6 +81,7 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) {
def checkoutsourcerepo(buildmeta, String checkoutfolder) {
def String sourcerepo = buildmeta.gitinfo.remoteurl
if (sourcerepo) {
repoandtagsappend(" Source repo: ${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) {
@ -89,6 +101,8 @@ def checkoutsourcerepo(buildmeta, String checkoutfolder) {
sh("git clone ${sourcerepo} ${checkoutfolder}")
}
}
} else {
repoandtagsappend(" Source repo: None")
}
}
@ -365,6 +379,7 @@ def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, Stri
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ")
repoandtagsappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ")
def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo)
checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)
@ -374,6 +389,7 @@ def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, Stri
}
summaryappend("\n")
repoandtagsappend("\n")
}
def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) {