This commit is contained in:
Dan Hawkins 2019-03-29 00:26:00 +00:00
commit 5aaaede0f8
6 changed files with 136 additions and 43 deletions

View file

@ -1,3 +1,4 @@
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) { def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) {
@ -35,4 +36,56 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat
return importedmeta return importedmeta
} }
def rewritemetafileasreleased(meta, String filepath) {
// Modify the meta info to say that is has already been released
meta.markreleased()
meta.saveJsonSerialised(filepath)
}
def artifactimportfromrepo(meta, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) {
def rooturl = repo.trim()
def rootrevision = revision.trim()
echo "Cloning root release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"
gh.gitCheckout(rooturl, rootrevision, destpath)
def importedmeta = meta.importrelated(destpath)
relatedimportinfo = importedmeta.getassociated()
echo "Cloning associated repos"
for(relatedmetainfo in relatedimportinfo) {
def relatedmeta = relatedmetainfo.meta
def relatedoffsetpath = relatedmetainfo.offsetpath
def cloneurl = relatedmeta.releaseinfo.releaserepoURL
def clonerevision = "refs/tags/${relatedmeta.releasetag()}"
def clonepath = "${destpath}/${relatedoffsetpath}"
echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}"
gh.gitCheckout(cloneurl, clonerevision, clonepath)
gh.stripgithistory(clonepath)
def metafilepath = "${clonepath}/${relatedmeta.metafilepath()}"
echo "Marking related meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(relatedmeta, metafilepath)
}
gh.stripgithistory(destpath)
def metafilepath = "${destpath}/${meta.metafilepath()}"
echo "Marking root meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(meta, metafilepath)
if (incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))
}
return importedmeta
}
def artifactimport(meta, String source, String jenkinsjob, buildnumberorselector, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) {
switch (source) {
case "Jenkins job artifact":
return artifactimport(meta, jenkinsjob, buildnumberorselector, destpath, incrementversionnumber, filter, excludes, fingerprint)
case "Release repository":
return artifactimportfromrepo(meta, repo, revision, destpath, incrementversionnumber, filter, excludes, fingerprint)
default:
error("Unknown type of artifact source: ${source}")
}
return meta
}
return this; return this;

View file

@ -219,11 +219,13 @@ class BuildStampInfo extends GISJsonSerialised {
class ReleaseInfo extends GISJsonSerialised { class ReleaseInfo extends GISJsonSerialised {
String releaserepoURL String releaserepoURL
ArrayList<String> releaseitems ArrayList<String> releaseitems
boolean released
ReleaseInfo(script, releaserepoURL = "") { ReleaseInfo(script, String releaserepoURL = "", boolean released = false) {
super(script) super(script)
this.releaserepoURL = releaserepoURL this.releaserepoURL = releaserepoURL
this.releaseitems = new ArrayList<String>() this.releaseitems = new ArrayList<String>()
this.released = released
} }
void set(String releaserepoURL = "") { void set(String releaserepoURL = "") {
@ -234,6 +236,10 @@ class ReleaseInfo extends GISJsonSerialised {
releaseitems.add(releaseitem) releaseitems.add(releaseitem)
} }
void markreleased() {
this.released = true
}
List releaseitemssserialised() { List releaseitemssserialised() {
def items = [] def items = []
for (ri in releaseitems) { for (ri in releaseitems) {
@ -248,12 +254,14 @@ class ReleaseInfo extends GISJsonSerialised {
for (rawreleaseitem in rawmeta['releaseitems']) { for (rawreleaseitem in rawmeta['releaseitems']) {
releaseitems.add(rawreleaseitem) releaseitems.add(rawreleaseitem)
} }
released = rawmeta['released'] ?: false
} }
LinkedHashMap serialisationdata() { LinkedHashMap serialisationdata() {
def data = [ def data = [
'releaserepoURL' : releaserepoURL, 'releaserepoURL' : releaserepoURL,
'releaseitems' : releaseitemssserialised(), 'releaseitems' : releaseitemssserialised(),
'released' : released
] ]
return data return data
} }
@ -477,6 +485,17 @@ class MetaInfo extends GISJsonSerialised {
associatedmeta = new ArrayList<RelatedMetaInfo>() associatedmeta = new ArrayList<RelatedMetaInfo>()
} }
List getassociated() {
return associatedmeta
}
void markreleased() {
releaseinfo.markreleased()
for (associated in associatedmeta) {
associated.meta.releaseinfo.markreleased()
}
}
List configurationinfoserialised() { List configurationinfoserialised() {
def configuration = [] def configuration = []
for (configurationitem in configurationinfo) { for (configurationitem in configurationinfo) {
@ -631,12 +650,11 @@ class MetaInfo extends GISJsonSerialised {
] ]
return data return data
} }
static String folder() { static String folder() {
return METAFOLDERNAME return METAFOLDERNAME
} }
String generateartifacts(ArrayList<String> releasedfromhere = new ArrayList<String>(), // These items are recorded in meta as released from here String generateartifacts(ArrayList<String> releasedfromhere = new ArrayList<String>(), // These items are recorded in meta as released from here
ArrayList<String> releasedfromsubmeta = new ArrayList<String>(), // These items are not recorded in meta as released from here ArrayList<String> releasedfromsubmeta = new ArrayList<String>(), // These items are not recorded in meta as released from here
String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}" String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}"
@ -684,7 +702,15 @@ class MetaInfo extends GISJsonSerialised {
} }
String componentversionuniqueidentifier() { String componentversionuniqueidentifier() {
return productinfo.productname + "_" + productinfo.subcomponentname + "_" + buildstampinfo.buildstamp return componentidentifier() + "_" + buildstampinfo.buildstamp
}
String globalreleasetag() {
return componentversionuniqueidentifier() + "_" + jenkinsbuildinfo.buildnumber
}
String releasetag() {
return buildstampinfo.buildstamp + "_" + jenkinsbuildinfo.buildnumber
} }
Map<String, RelatedMetaInfo> putwithshortestoffsetpath(Map<String, RelatedMetaInfo> releasemetacollection, String uniquestring, RelatedMetaInfo relatedmetainfo) { Map<String, RelatedMetaInfo> putwithshortestoffsetpath(Map<String, RelatedMetaInfo> releasemetacollection, String uniquestring, RelatedMetaInfo relatedmetainfo) {

View file

@ -133,19 +133,6 @@ def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) {
summaryappend("\n") summaryappend("\n")
} }
def stripgithistory() {
echo "Stripping git history out of ${releaserepofolder}"
dir(releaserepofolder) {
sh """#!/bin/bash
pwd
find . -type d -name ".git" | xargs -iXX rm -rvf XX
find . -name ".gitignore" | xargs -iXX rm -rvf XX
find . -name ".gitmodules" | xargs -iXX rm -rvf XX
find . -iname ".gitattributes" | xargs -iXX rm -rvf XX
"""
}
}
def convertitemstopublish(String itemstopublishstring) { def convertitemstopublish(String itemstopublishstring) {
def List paths = [] def List paths = []
@ -183,7 +170,7 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer,
def releaseinfo = componentReleaseInfoVersionUnique[key] def releaseinfo = componentReleaseInfoVersionUnique[key]
recallcomponent(releaseinfo, softwarerelease, itempathstopublish) recallcomponent(releaseinfo, softwarerelease, itempathstopublish)
} }
stripgithistory() gh.stripgithistory(releaserepofolder)
publish(customer) publish(customer)
return [summarystring, markunstable, unstablereason] return [summarystring, markunstable, unstablereason]

View file

@ -172,22 +172,29 @@ def ArrayList<String> maketaglist(buildmeta, String buildstamp, String otherrele
return taglist return taglist
} }
def boolean releasegittag(String postcommitshacode, String tag) { def String releasegitgetshacode(String tag) {
def boolean tagadded = false def existingshacode = ""
// Check if tag exists already // Check if tag exists already
def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true)
if (gitrevparsestatus == 0) { // Tag exists if (gitrevparsestatus == 0) { // Tag exists
def existingshacode = readFile(file: gitrevparseoutputfile).trim() existingshacode = readFile(file: gitrevparseoutputfile).trim()
}
return existingshacode
}
def boolean releasegittag(String postcommitshacode, String tag) {
def boolean tagadded = false
// Check if tag exists already
def String existingshacode = releasegitgetshacode(tag)
if (existingshacode) { // Tag exists
if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD
// This is a problem - The tag is already at another position in git repo // This is a problem - The tag is already at another position in git repo
setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it") setunstable("The tag ${tag} has been used at another commit other than HEAD - You must decide what to do with it - Not good practice to delete it or move it")
summaryappend("(${tag} - Could not add!)") summaryappend("(${tag} - Could not add!)")
} } else {
else {
summaryappend("(${tag} - Already added)") summaryappend("(${tag} - Already added)")
} }
} } else { // If tag does not exist already
else { // If tag does not exist already
// Tag // Tag
sh("git tag \"${tag}\"") sh("git tag \"${tag}\"")
summaryappend("(${tag})") summaryappend("(${tag})")
@ -270,26 +277,35 @@ def sourcegitpush(String dryrunpush ) {
def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) { def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String sourcerepo, String otherreleasetags, String dryrunpush) {
summaryappend(" Git operations: ") summaryappend(" Git operations: ")
def String buildstamp = buildmeta.buildstampinfo.buildstamp def String buildstamptag = buildmeta.releasetag()
def String buildstamptag = "${buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}"
dir(releaserepo) { dir(releaserepo) {
def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
echo "Pre commit sha code: ${precommitshacode}" echo "Pre commit sha code: ${precommitshacode}"
releasegitadd() def boolean alreadyreleased = buildmeta.releaseinfo.released
echo "Already released: ${alreadyreleased}"
def boolean changed = checkforchange(buildmeta, previousreleasemeta) def String postcommitshacode
if (changed) { def boolean changed = false
releasegitcommit(buildstamptag) if (alreadyreleased) {
} summaryappend("Already-released,")
else { postcommitshacode = releasegitgetshacode(buildstamptag)
releasegitreset() echo "Previous release sha code: ${postcommitshacode}"
summaryappend("No-commit,") } else {
} releasegitadd()
def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() changed = checkforchange(buildmeta, previousreleasemeta)
echo "Post commit sha code: ${postcommitshacode}" if (changed) {
releasegitcommit(buildstamptag)
} else {
releasegitreset()
summaryappend("No-commit,")
}
postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim()
echo "Post commit sha code: ${postcommitshacode}"
}
ArrayList<String> taglist = maketaglist(buildmeta, buildstamptag, otherreleasetags) ArrayList<String> taglist = maketaglist(buildmeta, buildstamptag, otherreleasetags)
def tagadded = releasegittags(postcommitshacode, taglist) def tagadded = releasegittags(postcommitshacode, taglist)
@ -299,7 +315,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
} }
} }
dir(sourcerepo) { dir(sourcerepo) {
def String srcbuildstamptag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildstamptag}" def String srcbuildstamptag = buildmeta.globalreleasetag()
def String buildsha = buildmeta.gitinfo.gitrevision def String buildsha = buildmeta.gitinfo.gitrevision
if (buildsha) { if (buildsha) {
@ -308,8 +324,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
if (tagadded) { if (tagadded) {
sourcegitpush(dryrunpush) sourcegitpush(dryrunpush)
} }
} } else {
else {
summaryappend(",No Src ") summaryappend(",No Src ")
} }
} }

View file

@ -43,8 +43,7 @@ pipeline {
script { script {
def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") def releaser = load("${autobuilder.commonscripts()}/release/do.groovy")
// Place the top level build stamp on all // Place the top level build stamp on all
def topleveltag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildmeta.buildstampinfo.buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}" OTHER_RELEASE_TAGS = "${buildmeta.globalreleasetag()},${OTHER_RELEASE_TAGS}"
OTHER_RELEASE_TAGS = "${topleveltag},${OTHER_RELEASE_TAGS}"
(summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH)
if (markunstable) { if (markunstable) {
env.unstablereason = unstablereason env.unstablereason = unstablereason

View file

@ -89,4 +89,17 @@ boolean checkAllVersionsAgree(java.util.LinkedHashMap versions) {
return true return true
} }
def stripgithistory(String rootfolder) {
echo "Stripping git history out of ${rootfolder}"
dir(rootfolder) {
sh """#!/bin/bash
pwd
find . -type d -name ".git" | xargs -iXX rm -rf XX
find . -name ".gitignore" | xargs -iXX rm -rf XX
find . -name ".gitmodules" | xargs -iXX rm -rf XX
find . -iname ".gitattributes" | xargs -iXX rm -rf XX
"""
}
}
return this return this