When importing artifacts from repo, clone subcomponents; Remove git history; Mark them as released
This commit is contained in:
parent
7dd532095c
commit
8cd99c0927
4 changed files with 38 additions and 16 deletions
|
|
@ -36,6 +36,12 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat
|
|||
return importedmeta
|
||||
}
|
||||
|
||||
def rewritemetafileasreleased(meta, String filepath) {
|
||||
// Modify the meta info to say that is has already been released
|
||||
meta.releaseinfo.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()
|
||||
|
|
@ -54,8 +60,16 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath,
|
|||
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}/${relatedmeta.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))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -219,11 +219,13 @@ class BuildStampInfo extends GISJsonSerialised {
|
|||
class ReleaseInfo extends GISJsonSerialised {
|
||||
String releaserepoURL
|
||||
ArrayList<String> releaseitems
|
||||
boolean released
|
||||
|
||||
ReleaseInfo(script, releaserepoURL = "") {
|
||||
ReleaseInfo(script, String releaserepoURL = "", boolean released = false) {
|
||||
super(script)
|
||||
this.releaserepoURL = releaserepoURL
|
||||
this.releaseitems = new ArrayList<String>()
|
||||
this.released = released
|
||||
}
|
||||
|
||||
void set(String releaserepoURL = "") {
|
||||
|
|
@ -234,6 +236,10 @@ class ReleaseInfo extends GISJsonSerialised {
|
|||
releaseitems.add(releaseitem)
|
||||
}
|
||||
|
||||
void markreleased() {
|
||||
this.released = true
|
||||
}
|
||||
|
||||
List releaseitemssserialised() {
|
||||
def items = []
|
||||
for (ri in releaseitems) {
|
||||
|
|
@ -248,12 +254,14 @@ class ReleaseInfo extends GISJsonSerialised {
|
|||
for (rawreleaseitem in rawmeta['releaseitems']) {
|
||||
releaseitems.add(rawreleaseitem)
|
||||
}
|
||||
released ?= rawmeta['released'] : false
|
||||
}
|
||||
|
||||
LinkedHashMap serialisationdata() {
|
||||
def data = [
|
||||
'releaserepoURL' : releaserepoURL,
|
||||
'releaseitems' : releaseitemssserialised(),
|
||||
'released' : released
|
||||
]
|
||||
return data
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,19 +133,6 @@ def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) {
|
|||
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 List paths = []
|
||||
|
||||
|
|
@ -183,7 +170,7 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer,
|
|||
def releaseinfo = componentReleaseInfoVersionUnique[key]
|
||||
recallcomponent(releaseinfo, softwarerelease, itempathstopublish)
|
||||
}
|
||||
stripgithistory()
|
||||
gh.stripgithistory(releaserepofolder)
|
||||
publish(customer)
|
||||
|
||||
return [summarystring, markunstable, unstablereason]
|
||||
|
|
|
|||
|
|
@ -89,4 +89,17 @@ boolean checkAllVersionsAgree(java.util.LinkedHashMap versions) {
|
|||
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 -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
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
||||
return this
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue