From 6a600862582d3b19a59e358007c038d471c3bc05 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 27 Mar 2019 08:56:29 +0000 Subject: [PATCH 01/18] Handle the artifact source parameter --- import/importer.groovy | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/import/importer.groovy b/import/importer.groovy index 5c996b4..40151e1 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -35,4 +35,18 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat 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; From 11b7fe881da3416d70bde83001592cc56f7aa9d8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 27 Mar 2019 08:59:37 +0000 Subject: [PATCH 02/18] Handle the artifact source parameter --- import/importer.groovy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 40151e1..abf3b2f 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -37,12 +37,10 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat 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": { + case "Jenkins job artifact": return artifactimport(meta, jenkinsjob, buildnumberorselector, destpath, incrementversionnumber, filter, excludes, fingerprint) - } - case "Release repository": { + case "Release repository": return artifactimportfromrepo(meta, repo, revision, destpath, incrementversionnumber, filter, excludes, fingerprint) - } default: error("Unknown type of artifact source: ${source}") } From ec33ceb812e97971316553e88676b32304aa8162 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 09:06:33 +0000 Subject: [PATCH 03/18] Import artifacts from repo --- import/importer.groovy | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index abf3b2f..e605743 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,4 +1,4 @@ -versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, boolean incrementversionnumber = true, String filter = '**', String excludes = '', boolean fingerprint = false) { copyArtifacts( @@ -35,6 +35,18 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat return importedmeta } +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() + gh.gitCheckout(rooturl, rootrevision, destpath) + + def importedmeta = meta.importrelated(destpath) + 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": From 51ba9bc94e85d07a464621c1d7d1c8d15f5ec673 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 09:25:47 +0000 Subject: [PATCH 04/18] Import artifacts from repo --- import/importer.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/import/importer.groovy b/import/importer.groovy index e605743..fc8395f 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,4 +1,5 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.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) { copyArtifacts( From 3745e27b9cb5d199044a693bf01f25e686257b7f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 13:57:21 +0000 Subject: [PATCH 05/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 9 +++++++++ meta/folder.groovy | 10 +++++++++- release/release.groovy | 3 +-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index fc8395f..133edba 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -42,6 +42,15 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, gh.gitCheckout(rooturl, rootrevision, destpath) def importedmeta = meta.importrelated(destpath) + + for(associatedmeta in getassociatedmeta) { + def cloneurl = associatedmeta.releaseinfo.releaserepoURL + def clonerevision = associatedmeta.releasetag() + def clonepath = "${destpath}/${associatedmeta.offsetpath}" + echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}" + gh.gitCheckout(cloneurl, rootrevision, clonepath) + } + if (incrementversionnumber) { meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision)) } diff --git a/meta/folder.groovy b/meta/folder.groovy index 1bf855c..053c38e 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -477,6 +477,10 @@ class MetaInfo extends GISJsonSerialised { associatedmeta = new ArrayList() } + ArrayList getassociatedmeta() { + return associatedmeta + } + List configurationinfoserialised() { def configuration = [] for (configurationitem in configurationinfo) { @@ -684,7 +688,11 @@ class MetaInfo extends GISJsonSerialised { } String componentversionuniqueidentifier() { - return productinfo.productname + "_" + productinfo.subcomponentname + "_" + buildstampinfo.buildstamp + return componentidentifier() + "_" + buildstampinfo.buildstamp + } + + String releasetag() { + return componentversionuniqueidentifier() + "_" + jenkinsbuildinfo.buildnumber } Map putwithshortestoffsetpath(Map releasemetacollection, String uniquestring, RelatedMetaInfo relatedmetainfo) { diff --git a/release/release.groovy b/release/release.groovy index b0530be..3b5321d 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -43,8 +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}_${buildmeta.jenkinsbuildinfo.buildnumber}" - OTHER_RELEASE_TAGS = "${topleveltag},${OTHER_RELEASE_TAGS}" + OTHER_RELEASE_TAGS = "${buildmeta.releasetag()},${OTHER_RELEASE_TAGS}" (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) if (markunstable) { env.unstablereason = unstablereason From 6056ba5874063695b74e72cee121b961e1cb3173 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 14:03:22 +0000 Subject: [PATCH 06/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index 133edba..09451ec 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -43,7 +43,7 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, def importedmeta = meta.importrelated(destpath) - for(associatedmeta in getassociatedmeta) { + for(associatedmeta in importedmeta.getassociatedmeta()) { def cloneurl = associatedmeta.releaseinfo.releaserepoURL def clonerevision = associatedmeta.releasetag() def clonepath = "${destpath}/${associatedmeta.offsetpath}" From 659859878d3aad5e532b7c2136d0c2b328030d40 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 14:19:39 +0000 Subject: [PATCH 07/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 09451ec..2392b83 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -43,10 +43,12 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, def importedmeta = meta.importrelated(destpath) - for(associatedmeta in importedmeta.getassociatedmeta()) { - def cloneurl = associatedmeta.releaseinfo.releaserepoURL - def clonerevision = associatedmeta.releasetag() - def clonepath = "${destpath}/${associatedmeta.offsetpath}" + for(relatedmetainfo in importedmeta.getassociatedmeta()) { + 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, rootrevision, clonepath) } From 9160063d947034622003e95e24eb2e31090e413e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 14:31:49 +0000 Subject: [PATCH 08/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index 2392b83..c554173 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -43,7 +43,8 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, def importedmeta = meta.importrelated(destpath) - for(relatedmetainfo in importedmeta.getassociatedmeta()) { + relatedimportinfo = importedmeta.getassociatedmeta() + for(relatedmetainfo in relatedimportinfo) { def relatedmeta = relatedmetainfo.meta def relatedoffsetpath = relatedmetainfo.offsetpath def cloneurl = relatedmeta.releaseinfo.releaserepoURL From ab18f25218f5afe0402fbc3e9f017ebdbf4af0a0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 16:45:17 +0000 Subject: [PATCH 09/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 3 ++- meta/folder.groovy | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index c554173..cdc2e1a 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -43,7 +43,8 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, def importedmeta = meta.importrelated(destpath) - relatedimportinfo = importedmeta.getassociatedmeta() + relatedimportinfo = importedmeta.getassociated() + echo "Cloning associated repos" for(relatedmetainfo in relatedimportinfo) { def relatedmeta = relatedmetainfo.meta def relatedoffsetpath = relatedmetainfo.offsetpath diff --git a/meta/folder.groovy b/meta/folder.groovy index 053c38e..987041b 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -477,7 +477,7 @@ class MetaInfo extends GISJsonSerialised { associatedmeta = new ArrayList() } - ArrayList getassociatedmeta() { + List getassociated() { return associatedmeta } @@ -635,12 +635,11 @@ class MetaInfo extends GISJsonSerialised { ] return data } - static String folder() { return METAFOLDERNAME } - + String generateartifacts(ArrayList releasedfromhere = new ArrayList(), // These items are recorded in meta as released from here ArrayList releasedfromsubmeta = new ArrayList(), // These items are not recorded in meta as released from here String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}" From 5006d6cd184fc11e30f1c99edf4dc390cb0e6d9a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 16:48:58 +0000 Subject: [PATCH 10/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/import/importer.groovy b/import/importer.groovy index cdc2e1a..78f89cc 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -39,6 +39,7 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat 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) From e23d564cb589081f986f9181d48e0a3e0b9fd701 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 16:57:54 +0000 Subject: [PATCH 11/18] When importing artifacts from repo, clone subcomponents --- meta/folder.groovy | 6 +++++- release/release.groovy | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 987041b..e805118 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -690,10 +690,14 @@ class MetaInfo extends GISJsonSerialised { return componentidentifier() + "_" + buildstampinfo.buildstamp } - String releasetag() { + String globalreleasetag() { return componentversionuniqueidentifier() + "_" + jenkinsbuildinfo.buildnumber } + String releasetag() { + return buildstampinfo.buildstamp + "_" + jenkinsbuildinfo.buildnumber + } + Map putwithshortestoffsetpath(Map releasemetacollection, String uniquestring, RelatedMetaInfo relatedmetainfo) { if (releasemetacollection.containsKey(uniquestring)) { def existingentry = releasemetacollection[uniquestring] diff --git a/release/release.groovy b/release/release.groovy index 3b5321d..79c0234 100644 --- a/release/release.groovy +++ b/release/release.groovy @@ -43,7 +43,7 @@ pipeline { script { def releaser = load("${autobuilder.commonscripts()}/release/do.groovy") // Place the top level build stamp on all - OTHER_RELEASE_TAGS = "${buildmeta.releasetag()},${OTHER_RELEASE_TAGS}" + OTHER_RELEASE_TAGS = "${buildmeta.globalreleasetag()},${OTHER_RELEASE_TAGS}" (summarystring, markunstable, unstablereason) = releaser.releasehierarchy(buildmeta, MAX_META_DEPTH, OTHER_RELEASE_TAGS, DRY_RUN_PUSH) if (markunstable) { env.unstablereason = unstablereason From 7dd532095cc0e8d597fb4cf41c9b1464b0708ca1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 17:00:25 +0000 Subject: [PATCH 12/18] When importing artifacts from repo, clone subcomponents --- import/importer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index 78f89cc..c6b80a4 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -53,7 +53,7 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, def clonerevision = "refs/tags/${relatedmeta.releasetag()}" def clonepath = "${destpath}/${relatedoffsetpath}" echo "Cloning release repo: ${cloneurl}, revision: ${clonerevision} at folder: ${clonepath}" - gh.gitCheckout(cloneurl, rootrevision, clonepath) + gh.gitCheckout(cloneurl, clonerevision, clonepath) } if (incrementversionnumber) { From 8cd99c0927f3a215c996e88c8896cb5a5c12077e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 18:33:55 +0000 Subject: [PATCH 13/18] When importing artifacts from repo, clone subcomponents; Remove git history; Mark them as released --- import/importer.groovy | 16 +++++++++++++++- meta/folder.groovy | 10 +++++++++- publish/do.groovy | 15 +-------------- versioncontrol/git.groovy | 13 +++++++++++++ 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index c6b80a4..c945ec0 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -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)) } diff --git a/meta/folder.groovy b/meta/folder.groovy index e805118..ec011ae 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -219,11 +219,13 @@ class BuildStampInfo extends GISJsonSerialised { class ReleaseInfo extends GISJsonSerialised { String releaserepoURL ArrayList releaseitems + boolean released - ReleaseInfo(script, releaserepoURL = "") { + ReleaseInfo(script, String releaserepoURL = "", boolean released = false) { super(script) this.releaserepoURL = releaserepoURL this.releaseitems = new ArrayList() + 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 } diff --git a/publish/do.groovy b/publish/do.groovy index 1a54b23..b63b15c 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -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] diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 9a313f2..7a1dd17 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -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 From 5659c8eeb41dbc2dcd48b1a7659ac1581e937287 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 18:36:35 +0000 Subject: [PATCH 14/18] When importing artifacts from repo, clone subcomponents; Remove git history; Mark them as released --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ec011ae..be85584 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -254,7 +254,7 @@ class ReleaseInfo extends GISJsonSerialised { for (rawreleaseitem in rawmeta['releaseitems']) { releaseitems.add(rawreleaseitem) } - released ?= rawmeta['released'] : false + released = rawmeta['released'] ?= false } LinkedHashMap serialisationdata() { From a5dc59e6b297e8728cb9bcb5723f65f9427318c1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 18:38:02 +0000 Subject: [PATCH 15/18] When importing artifacts from repo, clone subcomponents; Remove git history; Mark them as released --- meta/folder.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index be85584..a868855 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -254,7 +254,7 @@ class ReleaseInfo extends GISJsonSerialised { for (rawreleaseitem in rawmeta['releaseitems']) { releaseitems.add(rawreleaseitem) } - released = rawmeta['released'] ?= false + released = rawmeta['released'] ?: false } LinkedHashMap serialisationdata() { From 49783e0f468deb3318ce65a0024df3a32c200984 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 18:43:58 +0000 Subject: [PATCH 16/18] When importing artifacts from repo, clone subcomponents; Remove git history; Mark them as released --- import/importer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index c945ec0..a23ee83 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -66,7 +66,7 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath, rewritemetafileasreleased(relatedmeta, metafilepath) } gh.stripgithistory(destpath) - def metafilepath = "${destpath}/${relatedmeta.metafilepath()}" + def metafilepath = "${destpath}/${meta.metafilepath()}" echo "Marking root meta as released and rewriting meta file: ${metafilepath}" rewritemetafileasreleased(meta, metafilepath) From 86613fcb2cf9cab5dc11ec847a65dcfef9f67195 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 19:43:15 +0000 Subject: [PATCH 17/18] When releasing, take into account already-released components --- release/do.groovy | 61 ++++++++++++++++++++++++--------------- versioncontrol/git.groovy | 8 ++--- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index 604581a..fd2b06b 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -172,22 +172,29 @@ def ArrayList maketaglist(buildmeta, String buildstamp, String otherrele return taglist } -def boolean releasegittag(String postcommitshacode, String tag) { - def boolean tagadded = false +def String releasegitgetshacode(String tag) { + def existingshacode = "" // Check if tag exists already def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" >\"${gitrevparseoutputfile}\" 2>/dev/null", returnStatus: true) 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 // 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") summaryappend("(${tag} - Could not add!)") - } - else { + } else { summaryappend("(${tag} - Already added)") } - } - else { // If tag does not exist already + } else { // If tag does not exist already // Tag sh("git tag \"${tag}\"") summaryappend("(${tag})") @@ -270,26 +277,35 @@ 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 - def String buildstamptag = "${buildstamp}_${buildmeta.jenkinsbuildinfo.buildnumber}" + def String buildstamptag = buildmeta.releasetag() dir(releaserepo) { def String precommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() echo "Pre commit sha code: ${precommitshacode}" - releasegitadd() + def boolean alreadyreleased = buildmeta.releaseinfo.released + echo "Already released: ${alreadyreleased}" - def boolean changed = checkforchange(buildmeta, previousreleasemeta) - if (changed) { - releasegitcommit(buildstamptag) - } - else { - releasegitreset() - summaryappend("No-commit,") - } + def String postcommitshacode + def boolean changed = false + if (alreadyreleased) { + summaryappend("Already-released,") + postcommitshacode = releasegitgetshacode(buildstamptag) + echo "Previous release sha code: ${postcommitshacode}" + } else { + releasegitadd() - def String postcommitshacode = sh(script: "git rev-parse --verify HEAD", returnStdout: true).trim() - echo "Post commit sha code: ${postcommitshacode}" + changed = checkforchange(buildmeta, previousreleasemeta) + 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 taglist = maketaglist(buildmeta, buildstamptag, otherreleasetags) def tagadded = releasegittags(postcommitshacode, taglist) @@ -299,7 +315,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source } } dir(sourcerepo) { - def String srcbuildstamptag = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${buildstamptag}" + def String srcbuildstamptag = buildmeta.globalreleasetag() def String buildsha = buildmeta.gitinfo.gitrevision if (buildsha) { @@ -308,8 +324,7 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source if (tagadded) { sourcegitpush(dryrunpush) } - } - else { + } else { summaryappend(",No Src ") } } diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 7a1dd17..ba4d96b 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -94,10 +94,10 @@ def stripgithistory(String 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 + 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 """ } } From 6eb0f77114338dd00296ebfe7a8837c62dec34a6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 19:58:37 +0000 Subject: [PATCH 18/18] Recursively mark all associated items of meta as released --- import/importer.groovy | 2 +- meta/folder.groovy | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/import/importer.groovy b/import/importer.groovy index a23ee83..34707bc 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -38,7 +38,7 @@ def artifactimport(meta, String jenkinsjob, String buildselector, String destpat def rewritemetafileasreleased(meta, String filepath) { // Modify the meta info to say that is has already been released - meta.releaseinfo.markreleased() + meta.markreleased() meta.saveJsonSerialised(filepath) } diff --git a/meta/folder.groovy b/meta/folder.groovy index a868855..346b2ee 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -489,6 +489,13 @@ class MetaInfo extends GISJsonSerialised { return associatedmeta } + void markreleased() { + releaseinfo.markreleased() + for (associated in associatedmeta) { + associated.meta.releaseinfo.markreleased() + } + } + List configurationinfoserialised() { def configuration = [] for (configurationitem in configurationinfo) {