From 3745e27b9cb5d199044a693bf01f25e686257b7f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 28 Mar 2019 13:57:21 +0000 Subject: [PATCH] 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