Handle the case where rebuilt binaries change even though the original source has not changed and the version number has not changed - Tags now have the build number appended to them so that there is no tag clash during the release process - change the meta build tags too
This commit is contained in:
parent
4fd07d22d6
commit
ca173c1f13
2 changed files with 7 additions and 6 deletions
|
|
@ -270,7 +270,8 @@ def sourcegitpush(String dryrunpush ) {
|
|||
|
||||
def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) {
|
||||
summaryappend(" Git operations: ")
|
||||
def String buildstamp = "${buildmeta.buildstampinfo.buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}"
|
||||
def String buildstamp = buildmeta.buildstampinfo.buildstamp
|
||||
def String buildstamptag = "${buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}"
|
||||
|
||||
dir(releaserepo) {
|
||||
def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
|
||||
|
|
@ -280,7 +281,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
|
|||
|
||||
def boolean changed = checkforchange(buildmeta, previousreleasemeta)
|
||||
if (changed) {
|
||||
releasegitcommit(buildstamp)
|
||||
releasegitcommit(buildstamptag)
|
||||
}
|
||||
else {
|
||||
releasegitreset()
|
||||
|
|
@ -290,7 +291,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
|
|||
def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
|
||||
echo "Post commit sha code: ${postcommitshacode}"
|
||||
|
||||
ArrayList<String> taglist = maketaglist(buildmeta, buildstamp, otherreleasetags)
|
||||
ArrayList<String> taglist = maketaglist(buildmeta, buildstamptag, otherreleasetags)
|
||||
def tagadded = releasegittags(postcommitshacode, taglist)
|
||||
|
||||
if (changed || tagadded) {
|
||||
|
|
@ -298,11 +299,11 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
|
|||
}
|
||||
}
|
||||
dir(sourcerepo) {
|
||||
def String srcbuildstamp = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildstamp}"
|
||||
def String srcbuildstamptag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildstamptag}"
|
||||
def String buildsha = buildmeta.gitinfo.gitrevision
|
||||
|
||||
if (buildsha) {
|
||||
def ArrayList<String> srctaglist = maketaglist(buildmeta, srcbuildstamp, otherreleasetags)
|
||||
def ArrayList<String> srctaglist = maketaglist(buildmeta, srcbuildstamptag, otherreleasetags)
|
||||
def tagadded = sourcegittags(buildsha, srctaglist)
|
||||
if (tagadded) {
|
||||
sourcegitpush(dryrunpush)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ pipeline {
|
|||
script {
|
||||
def releaser = load("${autobuilder.commonscripts()}/release/do.groovy")
|
||||
// Place the top level build stamp on all
|
||||
def topleveltag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}"
|
||||
def topleveltag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}"
|
||||
OTHER_RELEASE_TAGS = "${topleveltag},${OTHER_RELEASE_TAGS}"
|
||||
(summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH)
|
||||
if (markunstable) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue