Merge remote-tracking branch 'origin/master' into production

This commit is contained in:
Dan Hawkins 2019-01-11 15:10:11 +00:00
commit e2d7bebb41

View file

@ -32,7 +32,8 @@ def preconditions() {
def setunstable(String reason) {
markunstable = true
unstablereason = reason
unstablereason += reason + "\n"
echo "Marked build as unstable: Reason: ${reason}"
}
def summaryappend(String summary) {
@ -157,14 +158,15 @@ def boolean checkforchange(buildmeta, previousreleasemeta) {
return changed
}
def ArrayList<String> maketaglist(String buildstamp, String otherreleasetags) {
def ArrayList<String> maketaglist(buildmeta, String buildstamp, String otherreleasetags) {
def ArrayList<String> taglist = new ArrayList<String>()
taglist.add(buildstamp)
def ArrayList<String> othertaglist = otherreleasetags.split(',')
for (othertagitem in othertaglist) {
if (othertagitem?.trim()) {
taglist.add(othertagitem.trim())
def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}"
taglist.add(componentothertagitem)
}
}
return taglist
@ -288,7 +290,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(buildstamp, otherreleasetags)
ArrayList<String> taglist = maketaglist(buildmeta, buildstamp, otherreleasetags)
def tagadded = releasegittags(postcommitshacode, taglist)
if (changed || tagadded) {
@ -300,7 +302,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
def String buildsha = buildmeta.gitinfo.gitrevision
if (buildsha) {
def ArrayList<String> srctaglist = maketaglist(srcbuildstamp, otherreleasetags)
def ArrayList<String> srctaglist = maketaglist(buildmeta, srcbuildstamp, otherreleasetags)
def tagadded = sourcegittags(buildsha, srctaglist)
if (tagadded) {
sourcegitpush(dryrunpush)