Check for changes occurring
This commit is contained in:
parent
15b9fe77bf
commit
419dc72545
2 changed files with 124 additions and 43 deletions
|
|
@ -568,7 +568,7 @@ class MetaInfo extends GISJsonSerialised {
|
|||
}
|
||||
|
||||
|
||||
String folder() {
|
||||
static String folder() {
|
||||
return METAFOLDERNAME
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ summaryfile = "${summaryfolder}/summary.txt"
|
|||
releaserepofolder = "${WORKSPACE}/releaserepos"
|
||||
tempfolder = "${WORKSPACE}/temp"
|
||||
|
||||
metascript = autobuilder.getmetafolderscript()
|
||||
|
||||
def resetfolders() {
|
||||
dir(summaryfolder) {
|
||||
deleteDir()
|
||||
|
|
@ -34,21 +36,36 @@ def summaryappend(String summary) {
|
|||
writeFile(file: summaryfile, text: currentsummarycontents + summary)
|
||||
}
|
||||
|
||||
def checkoutreleaserepo(info, String checkoutfolder) {
|
||||
def String releaserepo = info.meta.releaseinfo.releaserepoURL
|
||||
// Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component
|
||||
dir(releaserepofolder) {
|
||||
sh("git clone -n --depth 1 ${releaserepo} ${checkoutfolder}")
|
||||
def getpreviousreleasemeta(buildmeta, String checkoutfolder) {
|
||||
def previousreleasemeta = new metascript.MetaInfo(this)
|
||||
// See if there is meta data file from the current release
|
||||
def String releasemetafolderpath = "${checkoutfolder}/${buildmeta.folder()}"
|
||||
if (fileExists(releasemetafolderpath)) {
|
||||
previousreleasemeta = metascript.metafromfolder(releasemetafolderpath)
|
||||
}
|
||||
return previousreleasemeta
|
||||
}
|
||||
|
||||
def getcomponentartifacts(info, String repofolder, String tempfolder) {
|
||||
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
|
||||
def previousreleasemeta = new metascript.MetaInfo(this)
|
||||
dir(releaserepofolder) {
|
||||
sh("git clone --depth 1 ${releaserepo} ${checkoutfolder}")
|
||||
previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder)
|
||||
// Clear all existing files
|
||||
sh("git rm *")
|
||||
}
|
||||
return previousreleasemeta
|
||||
}
|
||||
|
||||
def getcomponentartifacts(buildinfo, String repofolder, String tempfolder) {
|
||||
// Copy relevant artifacts to temp folder
|
||||
summaryappend("Artifacts: ")
|
||||
for (artifactfilter in info.meta.releaseinfo.releaseitems) {
|
||||
for (artifactfilter in buildinfo.meta.releaseinfo.releaseitems) {
|
||||
def filterpath = artifactfilter
|
||||
if (info.offsetpath) {
|
||||
filterpath = info.offsetpath + '/' + artifactfilter
|
||||
if (buildinfo.offsetpath) {
|
||||
filterpath = buildinfo.offsetpath + '/' + artifactfilter
|
||||
}
|
||||
// Copy relevant artifacts to temp folder
|
||||
echo "Copying artifacts: ${filterpath} to ${tempfolder}"
|
||||
|
|
@ -62,7 +79,7 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) {
|
|||
target: tempfolder
|
||||
)
|
||||
// Move relevant artifacts from temp folder to release position
|
||||
def originalrootdir = tempfolder + "/" + info.offsetpath
|
||||
def originalrootdir = tempfolder + "/" + buildinfo.offsetpath
|
||||
dir(originalrootdir) {
|
||||
sh("mv * ${repofolder}")
|
||||
}
|
||||
|
|
@ -70,59 +87,123 @@ def getcomponentartifacts(info, String repofolder, String tempfolder) {
|
|||
}
|
||||
}
|
||||
|
||||
def gitrelease(String releaserepo, String buildstamp, String dryrunpush) {
|
||||
def releasegitadd() {
|
||||
// Add anything new
|
||||
sh("git add .")
|
||||
summaryappend("Add,")
|
||||
}
|
||||
|
||||
def releasegitreset() {
|
||||
// Add anything new
|
||||
sh("git reset --hard")
|
||||
sh("git clean -fdx")
|
||||
summaryappend("Reset,")
|
||||
}
|
||||
|
||||
def releasegitcommit(String buildstamp) {
|
||||
sh("git commit -a -m ${buildstamp}")
|
||||
summaryappend("Commit,")
|
||||
}
|
||||
|
||||
// Determine if there has been a change by comparing the sha code in previous release meta and the build meta
|
||||
def boolean checkforchange(buildmeta, previousreleasemeta) {
|
||||
String buildsha = buildmeta.gitinfo.gitrevision
|
||||
String previoussha = previousreleasemeta.gitinfo.gitrevision
|
||||
|
||||
def boolean changed = (buildsha != previoussha)
|
||||
echo "buildsha: ${buildsha} previoussha: ${previoussha} changed: ${changed}"
|
||||
return changed
|
||||
}
|
||||
|
||||
def ArrayList<String> maketaglist(String buildstamp, String otherreleasetags) {
|
||||
ArrayList<String> taglist = new ArrayList<String>()
|
||||
taglist.add(buildstamp)
|
||||
|
||||
ArrayList<String> othertaglist = otherreleasetags.split(',')
|
||||
for (othertagitem in othertaglist) {
|
||||
taglist.add(othertagitem.trim())
|
||||
}
|
||||
return taglist
|
||||
}
|
||||
|
||||
def boolean releasegittag(String postcommitshacode, String tag) {
|
||||
// Tag
|
||||
sh("git tag ${tag}")
|
||||
summaryappend("(${tag}),")
|
||||
}
|
||||
|
||||
def boolean releasegittags(String postcommitshacode, ArrayList<String> taglist) {
|
||||
boolean tagadded = false
|
||||
|
||||
summaryappend("Rel Tag ")
|
||||
for (tag in taglist) {
|
||||
if (releasegittag(postcommitshacode, tag)) {
|
||||
tagadded = true
|
||||
}
|
||||
}
|
||||
return tagadded
|
||||
}
|
||||
|
||||
def releasegitpush(String dryrunpush ) {
|
||||
if (dryrunpush == "true") {
|
||||
sh("git push -n --tags origin master")
|
||||
summaryappend("Dry-Run-Push")
|
||||
setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)")
|
||||
}
|
||||
else {
|
||||
sh("git push --tags origin master")
|
||||
summaryappend("Push")
|
||||
}
|
||||
}
|
||||
|
||||
def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String otherreleasetags, String dryrunpush) {
|
||||
summaryappend(" Git operations: ")
|
||||
def String buildstamp = buildinfo.meta.buildstampinfo.buildstamp
|
||||
dir(releaserepo) {
|
||||
def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
|
||||
echo "Pre commit sha code: ${precommitshacode}"
|
||||
// Add anything new
|
||||
sh("git add .")
|
||||
summaryappend("Add,")
|
||||
// Perform git commit (if necessary)
|
||||
def changes = sh(script: "git status --porcelain", returnStdout: true)
|
||||
boolean changesoccurred = changes?.trim()
|
||||
echo "changes: ${changes}\nchangesoccurred: ${changesoccurred}"
|
||||
if (changesoccurred) {
|
||||
sh("git commit -a -m ${buildstamp}")
|
||||
summaryappend("Commit,")
|
||||
|
||||
releasegitadd()
|
||||
|
||||
def boolean changed = checkforchange(buildmeta, previousreleasemeta)
|
||||
if (changed) {
|
||||
releasegitcommit(buildstamp)
|
||||
}
|
||||
else {
|
||||
releasegitreset()
|
||||
summaryappend("No-commit,")
|
||||
}
|
||||
|
||||
def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
|
||||
echo "Post commit sha code: ${precommitshacode}"
|
||||
// Tag with buildstamp
|
||||
sh("git tag ${buildstamp}")
|
||||
summaryappend("Tag (${buildstamp}),")
|
||||
if (dryrunpush == "true") {
|
||||
sh("git push -n --tags origin master")
|
||||
summaryappend("Dry-Run-Push,")
|
||||
setunstable("The artifact(s) have not been pushed/saved (\"Dry run push\" parameter/option is selected)")
|
||||
}
|
||||
else {
|
||||
sh("git push --tags origin master")
|
||||
summaryappend("Push")
|
||||
echo "Post commit sha code: ${postcommitshacode}"
|
||||
|
||||
ArrayList<String> taglist = maketaglist(buildstamp, otherreleasetags)
|
||||
|
||||
def boolean tagadded = releasegittags(postcommitshacode, taglist)
|
||||
|
||||
if (changed || tagadded) {
|
||||
releasegitpush(dryrunpush)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def releasecomponent(info, String dryrunpush) {
|
||||
def String uniquefolder = "${info.meta.productinfo.productname}_${info.meta.productinfo.subcomponentname}"
|
||||
def releasecomponent(buildinfo, String otherreleasetags, String dryrunpush) {
|
||||
def buildmeta = buildinfo.meta
|
||||
def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}"
|
||||
def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
|
||||
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
|
||||
|
||||
summaryappend("${info.meta.productinfo.productname} ${info.meta.productinfo.subcomponentname}: ")
|
||||
checkoutreleaserepo(info, uniquefolderforrepo)
|
||||
summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ")
|
||||
def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo)
|
||||
|
||||
getcomponentartifacts(info, uniquefolderforrepo, uniquefoldertemp)
|
||||
getcomponentartifacts(buildinfo, uniquefolderforrepo, uniquefoldertemp)
|
||||
|
||||
def String buildstamp = info.meta.buildstampinfo.buildstamp
|
||||
gitrelease(uniquefolderforrepo, buildstamp, dryrunpush)
|
||||
gitrelease(buildmeta, previousreleasemeta, uniquefolderforrepo, otherreleasetags, dryrunpush)
|
||||
|
||||
summaryappend("\n")
|
||||
}
|
||||
|
||||
def releasehierarchy(buildmeta, String maxdepth, dryrunpush) {
|
||||
def releasehierarchy(buildmeta, String maxdepth, String otherreleasetags, String dryrunpush) {
|
||||
int md = maxdepth.toInteger()
|
||||
resetfolders()
|
||||
preconditions()
|
||||
|
|
@ -132,8 +213,8 @@ def releasehierarchy(buildmeta, String maxdepth, dryrunpush) {
|
|||
|
||||
// For each component
|
||||
for (key in componentReleaseInfo.keySet()) {
|
||||
def info = componentReleaseInfo[key]
|
||||
releasecomponent(info, dryrunpush)
|
||||
def buildinfo = componentReleaseInfo[key]
|
||||
releasecomponent(buildinfo, otherreleasetags, dryrunpush)
|
||||
}
|
||||
return [markunstable, unstablereason]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue