From bdbc579b38d51edbdeeb39a7071d85c9b6fa053a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 24 Dec 2021 09:13:57 +0000 Subject: [PATCH 1/5] Pass meta path to publisher walker --- publish/do.groovy | 8 ++++---- publish/promptingpublish.groovy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 9f5bd21..ea090f0 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -140,14 +140,14 @@ def convertitemstopublish(String itemstopublishstring) { // Publish selected items from a release to the customer folder on the ftp site // itemstopublishstring is a comma-seperated set of strings in this format ## -def publishhierarchy(hostedftpsiteinfo, releasemeta, String itemstopublishstring, String customer, String softwarerelease, String maxdepth) { +def publishhierarchy(hostedftpsiteinfo, releasemeta, String releasemetapath, String itemstopublishstring, String customer, String softwarerelease, String maxdepth) { int md = maxdepth.toInteger() resetfolders() preconditions() def productline = releasemeta.productinfo.productname // Walk the meta information to a max depth, looking for artifacts to publish - def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md) + def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md, '', releasemetapath) echo "Version unique components:" def String versionuniquecomponent = "" @@ -167,8 +167,8 @@ def publishhierarchy(hostedftpsiteinfo, releasemeta, String itemstopublishstring return [summarystring, markunstable, unstablereason] } -def publishhierarchy(hostedftpsiteinfo, releasemeta, String customer, String softwarerelease, String maxdepth) { - return publishhierarchy(hostedftpsiteinfo, releasemeta, "", customer, softwarerelease, maxdepth) +def publishhierarchy(hostedftpsiteinfo, releasemeta, String releasemetapath, String customer, String softwarerelease, String maxdepth) { + return publishhierarchy(hostedftpsiteinfo, releasemeta, releasemetapath, '', customer, softwarerelease, maxdepth) } return this; diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 58c72eb..4cc0e24 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -135,7 +135,7 @@ pipeline { script { def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy") def hostedftpsiteinfo = hostedftb.getHostedFTPSiteInfo() - (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(hostedftpsiteinfo, releasemeta, selecteditems, customer, release, MAX_META_DEPTH) + (summarystring, markunstable, unstablereason) = publisher.publishhierarchy(hostedftpsiteinfo, releasemeta, SOURCEDIR, selecteditems, customer, release, MAX_META_DEPTH) if (markunstable) { env.unstablereason = unstablereason currentBuild.result = 'UNSTABLE' From c8a66b7eb6b6fbac24daf65e00573a0228780afa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 24 Dec 2021 10:58:06 +0000 Subject: [PATCH 2/5] Exclude erroneous sub-component from release --- release/do.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index c61f1dd..05f9d53 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -441,8 +441,10 @@ def releasehierarchy(String buildfolder, String metafolder, buildmeta, String ma // For each component for (key in componentReleaseInfo.keySet()) { def buildinfo = componentReleaseInfo[key] - if (toplevelid != key) { - releasecomponent(buildmeta, buildinfo, otherreleasetags, dryrunpush) + if (buildinfo.metainfo.componentidentifier != '___') { + if (toplevelid != key) { + releasecomponent(buildmeta, buildinfo, otherreleasetags, dryrunpush) + } } } // Do the top level last From fb35654c9ac71ec738fbd76c598fceda8289f553 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 24 Dec 2021 11:02:05 +0000 Subject: [PATCH 3/5] Exclude erroneous sub-component from release --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 05f9d53..09249ad 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -441,7 +441,7 @@ def releasehierarchy(String buildfolder, String metafolder, buildmeta, String ma // For each component for (key in componentReleaseInfo.keySet()) { def buildinfo = componentReleaseInfo[key] - if (buildinfo.metainfo.componentidentifier != '___') { + if (buildinfo.metainfo.componentidentifier() != '___') { if (toplevelid != key) { releasecomponent(buildmeta, buildinfo, otherreleasetags, dryrunpush) } From 8297893901f91026893e94e802ff663dd570e6cb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 27 Dec 2021 21:15:08 +0000 Subject: [PATCH 4/5] Correct publish list --- publish/promptingpublish.groovy | 1 + publish/publishitems.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/publish/promptingpublish.groovy b/publish/promptingpublish.groovy index 4cc0e24..ce6a805 100644 --- a/publish/promptingpublish.groovy +++ b/publish/promptingpublish.groovy @@ -114,6 +114,7 @@ pipeline { 'Select software items', 'Software items', releasemeta, + SOURCEDIR, ITEMSDEFAULTLIST, MAX_META_DEPTH, '20', diff --git a/publish/publishitems.groovy b/publish/publishitems.groovy index 06e5fba..9f6c368 100644 --- a/publish/publishitems.groovy +++ b/publish/publishitems.groovy @@ -18,6 +18,7 @@ class PublishableItemsSelection { String name, String description, releasemeta, + String releasemetapath, String preselectedext, String metalevelsstringext, String visibleItemCountExt, @@ -25,7 +26,7 @@ class PublishableItemsSelection { outputSelectionfromPreselect(preselectedmenuitems, preselectedext) def Integer metalevelsext = metalevelsstringext.toInteger() def Integer visibleItemCount = visibleItemCountExt.toInteger() - def metaitems = releasemeta.releasewalkerunique(metalevelsext) + def metaitems = releasemeta.releasewalkerunique(metalevelsext, '', releasemetapath) for (key in metaitems.keySet()) { def releaseinfo = metaitems[key] outputDescription(menuitemdescriptions, releaseinfo) @@ -113,13 +114,14 @@ PublishableItemsSelection createItemSelector( String name, String description, releasemeta, + String releasemetapath, String preselectedext, String metalevelsstringext, String visibleItemCountExt = '20', String type = 'PT_CHECKBOX') { // Could also be "PT_MULTI_SELECT" PublishableItemsSelection pis = new PublishableItemsSelection(this) - pis.init(name, description, releasemeta, preselectedext, metalevelsstringext, visibleItemCountExt, type) + pis.init(name, description, releasemeta, releasemetapath, preselectedext, metalevelsstringext, visibleItemCountExt, type) return pis } From 600d4584db6070fe88587a8505fce172f58c307d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 27 Dec 2021 22:59:14 +0000 Subject: [PATCH 5/5] Remove timeout warning --- versioncontrol/git.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 288d5db..a22054b 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -195,8 +195,8 @@ def docheckout(String gitURL, String revision, int cloneDepth, String reporootpa [name: revision] ], extensions: [ - [$class: 'GitLFSPull',timeout: 25], - [$class: 'CleanBeforeCheckout',timeout: 20], + [$class: 'GitLFSPull'], + [$class: 'CleanBeforeCheckout'], [$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120], [$class: 'CheckoutOption', timeout: 120], [$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir],