From 1c9579fc3b92298ab6f220c9790e19acceb4ed7c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 10 Mar 2022 23:04:26 +0000 Subject: [PATCH 01/31] Use raw git to checkout each tag --- product/info.groovy | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 3d7bc30..128bce3 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -159,29 +159,38 @@ def parseproductrepo(LinkedHashMap products, def ProductParsed pp def ArrayList productreleases = new ArrayList() - shatagmap.each { sha, tags -> - def importoptions = importer.getNewImportOptions() - importoptions.releaserepo(productrepo, sha) - importoptions.setfilter('meta/**') - def productreleasemeta = importer.artifactimport(meta, - importoptions, - productreleasefolder) - if (!productvariant) { - productvariant = productreleasemeta.productvariant() - pp = addProductEntry(products, - productvariant, productrepo) + dir(productreleasefolder) { + deleteDir() + sh """#!/bin/bash + git init + git config remote.origin.url ${productrepo} + git sparse-checkout init + git sparse-checkout set meta/* + git pull -t + """ + shatagmap.each { sha, tags -> + sh """#!/bin/bash + git checkout ${sha} + """ + def productreleasemeta = meta.importrelated(false, productreleasefolder) + + if (!productvariant) { + productvariant = productreleasemeta.productvariant() + pp = addProductEntry(products, + productvariant, productrepo) + } + + def productrelease = new ProductRelease(sha, + productreleasemeta.jenkinsbuildinfo.builddate, + tags) + parseproductdependencies(products, + productreleasemeta, + productreleasefolder, + productvariant, + productrelease) + pp.addProductRelease(productrelease) } - - def productrelease = new ProductRelease(sha, - productreleasemeta.jenkinsbuildinfo.builddate, - tags) - parseproductdependencies(products, - productreleasemeta, - productreleasefolder, - productvariant, - productrelease) - pp.addProductRelease(productrelease) } pp.markparsed() } From 82f9bb6040f5d360a3d07e8831bae4e4ef4e86a9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 10 Mar 2022 23:24:11 +0000 Subject: [PATCH 02/31] Use raw git to checkout each tag --- product/info.groovy | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 128bce3..4e6d026 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -165,32 +165,37 @@ def parseproductrepo(LinkedHashMap products, sh """#!/bin/bash git init git config remote.origin.url ${productrepo} + git config advice.detachedHead false git sparse-checkout init git sparse-checkout set meta/* git pull -t """ - shatagmap.each { sha, tags -> + } + shatagmap.each { sha, tags -> + echo "Sha is ${sha}" + dir(productreleasefolder) { sh """#!/bin/bash git checkout ${sha} """ - def productreleasemeta = meta.importrelated(false, productreleasefolder) - - if (!productvariant) { - productvariant = productreleasemeta.productvariant() - pp = addProductEntry(products, - productvariant, productrepo) - } - - def productrelease = new ProductRelease(sha, - productreleasemeta.jenkinsbuildinfo.builddate, - tags) - parseproductdependencies(products, - productreleasemeta, - productreleasefolder, - productvariant, - productrelease) - pp.addProductRelease(productrelease) } + def productreleasemeta = meta.importrelated(false, productreleasefolder) + + if (!productvariant) { + productvariant = productreleasemeta.productvariant() + pp = addProductEntry(products, + productvariant, + productrepo) + } + + def productrelease = new ProductRelease(sha, + productreleasemeta.jenkinsbuildinfo.builddate, + tags) + parseproductdependencies(products, + productreleasemeta, + productreleasefolder, + productvariant, + productrelease) + pp.addProductRelease(productrelease) } pp.markparsed() } From df5c9d1ffc0687d357d0b3a0573a211036ba9bb8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 10 Mar 2022 23:40:51 +0000 Subject: [PATCH 03/31] Remove debug --- product/info.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 4e6d026..595f47a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -28,7 +28,6 @@ class ProductDependency { def setreleasestate() { def LinkedHashMap results = rtscript.startswithspecialprefix(presplitreleasetag) - script.echo("results is: ${results.dump()}") if (results.hasspecialprefix) { releasetag = results.tagwithoutprefix releasestate = results.prefixfound From 66a6672c4dd809afc4302c4aaebcb032d2912aed Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 10 Mar 2022 23:59:30 +0000 Subject: [PATCH 04/31] Debug sha/tags table --- versioncontrol/git.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 61378b5..9eadd6f 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -54,6 +54,9 @@ LinkedHashMap> getremoteshatagmap(String repositoryURL shatagmap.put(sha, taglist) } } + shatagmap.each { sha, tags -> + echo "sha: ${sha} has tags: ${tags}" + } return shatagmap } From 2580ed3db12d7f3b2438bce68d645a4398dcb151 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 00:13:12 +0000 Subject: [PATCH 05/31] Debug sha/tags table --- product/info.groovy | 2 +- versioncontrol/git.groovy | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 595f47a..11f76ba 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -171,7 +171,7 @@ def parseproductrepo(LinkedHashMap products, """ } shatagmap.each { sha, tags -> - echo "Sha is ${sha}" + echo "Sha: ${sha} has tags: ${tags}" dir(productreleasefolder) { sh """#!/bin/bash git checkout ${sha} diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index 9eadd6f..2b6fb09 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -43,7 +43,6 @@ LinkedHashMap> getremoteshatagmap(String repositoryURL def shatagfields = shatag.split('\\t') def sha = shatagfields[0].trim() def tag = shatagfields[1].trim() - echo "sha: ${sha} tag: ${tag}" if (shatagmap.get(sha) == null) { def ArrayList taglist = new ArrayList() taglist.add(tag) From fd795d2bda076e4242176e554b057bd05cffe713 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 00:23:17 +0000 Subject: [PATCH 06/31] Debug sha/tags table --- product/info.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/product/info.groovy b/product/info.groovy index 11f76ba..eaf9e3a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -184,19 +184,23 @@ def parseproductrepo(LinkedHashMap products, pp = addProductEntry(products, productvariant, productrepo) + echo "Productvariant: ${pp.productvariant} created" } def productrelease = new ProductRelease(sha, productreleasemeta.jenkinsbuildinfo.builddate, tags) + echo "Productrelease: ${productrelease.sha} created" parseproductdependencies(products, productreleasemeta, productreleasefolder, productvariant, productrelease) + echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" pp.addProductRelease(productrelease) } pp.markparsed() + echo "Productvariant: ${pp.productvariant} parsed" } def iterateinitialproductrepos(initialproductcollection, From 149aad2c30ae819827cbfc49d39e6bb070a2cb45 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 00:37:44 +0000 Subject: [PATCH 07/31] Debug sha/tags table --- product/info.groovy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index eaf9e3a..bdbe3cf 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -214,15 +214,22 @@ def iterateinitialproductrepos(initialproductcollection, } while( true ) { boolean allparsed = true + echo "Parsing extra products" productcollection.each { releaserepo, productparsed -> if (!productparsed.parsed()) { + echo "Querying unparsed ${productparsed.productvariant}" allparsed = false parseproductrepo(productcollection, releaserepo, productreleasefolder) + } else { + echo "Parsed already ${productparsed.productvariant}" } } - if (allparsed) break + if (allparsed) { + echo "All parsed" + break + } } } From e711a6cc5464e15c242a9c8b8d325b2425e5931e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 00:49:12 +0000 Subject: [PATCH 08/31] Debug sha/tags table --- product/info.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/product/info.groovy b/product/info.groovy index bdbe3cf..2dbf979 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -107,6 +107,7 @@ def addProductEntry(LinkedHashMap products, String releaserepo) { def productparsed if (products.get(releaserepo) == null) { // Use the first entry name only + echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" productparsed = new ProductParsed(productvariant) products.put(releaserepo, productparsed) } else { From 93b2f2b0b91138a7fec2a2102ce6367137c246cc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 08:10:29 +0000 Subject: [PATCH 09/31] Debug sha/tags table --- product/info.groovy | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 2dbf979..bfe1f77 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -102,21 +102,21 @@ class ProductParsed { } } -def addProductEntry(LinkedHashMap products, +def ProductParsed addProductEntry(LinkedHashMap productcollection, String productvariant, String releaserepo) { - def productparsed - if (products.get(releaserepo) == null) { // Use the first entry name only + def ProductParsed productparsed + if (productcollection.get(releaserepo) == null) { // Use the first entry name only echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" productparsed = new ProductParsed(productvariant) - products.put(releaserepo, productparsed) + productcollection.put(releaserepo, productparsed) } else { - productparsed = products.get(releaserepo) + productparsed = productcollection.get(releaserepo) } return productparsed } -def parseproductdependencies(LinkedHashMap products, +def parseproductdependencies(LinkedHashMap productcollection, productreleasemeta, String productreleasefolder, String containingproductvariant, @@ -132,13 +132,13 @@ def parseproductdependencies(LinkedHashMap products, pd.setreleasestate() if (meta.productinfo.subcomponentname == 'WHOLE') { if (meta.productvariant() != containingproductvariant) { // Don't add myself - addProductEntry(products, + addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } } else if (meta.productvariant() != containingproductvariant) { - addProductEntry(products, + addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) @@ -151,7 +151,7 @@ def parseproductdependencies(LinkedHashMap products, } } -def parseproductrepo(LinkedHashMap products, +def parseproductrepo(LinkedHashMap productcollection, String productrepo, String productreleasefolder) { def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) @@ -182,7 +182,7 @@ def parseproductrepo(LinkedHashMap products, if (!productvariant) { productvariant = productreleasemeta.productvariant() - pp = addProductEntry(products, + pp = addProductEntry(productcollection, productvariant, productrepo) echo "Productvariant: ${pp.productvariant} created" @@ -192,7 +192,7 @@ def parseproductrepo(LinkedHashMap products, productreleasemeta.jenkinsbuildinfo.builddate, tags) echo "Productrelease: ${productrelease.sha} created" - parseproductdependencies(products, + parseproductdependencies(productcollection, productreleasemeta, productreleasefolder, productvariant, From 9f0a5dbc39c6ee7ece144092e5667e047471cb42 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 08:18:58 +0000 Subject: [PATCH 10/31] Debug sha/tags table --- product/info.groovy | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index bfe1f77..3cc3bb9 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -106,12 +106,17 @@ def ProductParsed addProductEntry(LinkedHashMap productco String productvariant, String releaserepo) { def ProductParsed productparsed - if (productcollection.get(releaserepo) == null) { // Use the first entry name only - echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" - productparsed = new ProductParsed(productvariant) - productcollection.put(releaserepo, productparsed) + + echo "Attempting to add product variant: ${productvariant} releaserepo: ${releaserepo}" + if (productvariant && releaserepo) { + if (productcollection.get(releaserepo) == null) { // Use the first entry name only + echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" + productparsed = new ProductParsed(productvariant) + productcollection.put(releaserepo, productparsed) + productparsed = productcollection.get(releaserepo) + } } else { - productparsed = productcollection.get(releaserepo) + echo "Not adding product variant: ${productvariant} releaserepo: ${releaserepo}" } return productparsed } From eb960a6d80ddcf015690e63cc1ec354f13ed45d5 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 08:25:17 +0000 Subject: [PATCH 11/31] Debug sha/tags table --- product/info.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 3cc3bb9..995c936 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -135,14 +135,14 @@ def parseproductdependencies(LinkedHashMap productcollect meta.releasetag(), meta.releaseinfo.releaserepoURL) pd.setreleasestate() - if (meta.productinfo.subcomponentname == 'WHOLE') { + if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { if (meta.productvariant() != containingproductvariant) { // Don't add myself addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } - } else if (meta.productvariant() != containingproductvariant) { + } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) From 9235c1aa6f9b7fc2551aa930ef2e13199db71409 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 11 Mar 2022 08:41:35 +0000 Subject: [PATCH 12/31] Debug sha/tags table --- product/info.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/product/info.groovy b/product/info.groovy index 995c936..ec84c10 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -114,6 +114,8 @@ def ProductParsed addProductEntry(LinkedHashMap productco productparsed = new ProductParsed(productvariant) productcollection.put(releaserepo, productparsed) productparsed = productcollection.get(releaserepo) + } else { + echo "Already added product variant: ${productvariant}" } } else { echo "Not adding product variant: ${productvariant} releaserepo: ${releaserepo}" From da33b16cdf47f892cd007664f8ebb25334a690e9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 09:28:08 +0000 Subject: [PATCH 13/31] Debug sha/tags table --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index ec84c10..24650ac 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -113,10 +113,10 @@ def ProductParsed addProductEntry(LinkedHashMap productco echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" productparsed = new ProductParsed(productvariant) productcollection.put(releaserepo, productparsed) - productparsed = productcollection.get(releaserepo) } else { echo "Already added product variant: ${productvariant}" } + productparsed = productcollection.get(releaserepo) } else { echo "Not adding product variant: ${productvariant} releaserepo: ${releaserepo}" } From 390c97c87bc4f8b835aaa752d6a04da04bc850a9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 10:24:22 +0000 Subject: [PATCH 14/31] Debug sha/tags table --- meta/folder.groovy | 2 +- product/info.groovy | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index ac3d0dd..67ca47a 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -1103,7 +1103,7 @@ class MetaInfo extends GISJsonSerialised { def ArrayList metacollection = new ArrayList() def Map metamap = new LinkedHashMap() def IterationInfo ii = new IterationInfo(metacollection, metamap, 'meta', 0, startpath, startmetapath, true, maxdepth) - script.echo("Release walker iteration info at start:\n${ii.show()}") + //script.echo("Release walker iteration info at start:\n${ii.show()}") def results = walkrelated(ii) return results.metacollection } diff --git a/product/info.groovy b/product/info.groovy index 24650ac..14a7ea4 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -181,9 +181,16 @@ def parseproductrepo(LinkedHashMap productcollection, shatagmap.each { sha, tags -> echo "Sha: ${sha} has tags: ${tags}" dir(productreleasefolder) { - sh """#!/bin/bash - git checkout ${sha} - """ + def returnstatus = sh( script: """#!/bin/bash + git checkout ${sha} + """, + returnStatus: true) + echo "returnstatus: ${returnstatus}" + if (returnstatus > 0) { + dir('meta') { + deleteDir() + } + } } def productreleasemeta = meta.importrelated(false, productreleasefolder) From 60c1fbab1375aad98a629eb06465b3d3af9ca972 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 10:54:46 +0000 Subject: [PATCH 15/31] Debug sha/tags table --- product/info.groovy | 52 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 14a7ea4..bbda541 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -93,6 +93,10 @@ class ProductParsed { scanstate = State.PARSED } + def markparseerror() { + scanstate = State.PARSED + } + def boolean parsed() { return (scanstate == State.PARSED) } @@ -161,12 +165,6 @@ def parseproductdependencies(LinkedHashMap productcollect def parseproductrepo(LinkedHashMap productcollection, String productrepo, String productreleasefolder) { - def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) - def String productvariant - def ProductParsed pp - - def ArrayList productreleases = new ArrayList() - dir(productreleasefolder) { deleteDir() sh """#!/bin/bash @@ -178,6 +176,9 @@ def parseproductrepo(LinkedHashMap productcollection, git pull -t """ } + def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) + def String productvariant + def ProductParsed pp shatagmap.each { sha, tags -> echo "Sha: ${sha} has tags: ${tags}" dir(productreleasefolder) { @@ -193,29 +194,36 @@ def parseproductrepo(LinkedHashMap productcollection, } } def productreleasemeta = meta.importrelated(false, productreleasefolder) - if (!productvariant) { productvariant = productreleasemeta.productvariant() pp = addProductEntry(productcollection, productvariant, productrepo) - echo "Productvariant: ${pp.productvariant} created" + if (pp) { + echo "Productvariant: ${pp.productvariant} created" + } else { + echo "No product entry added/associated with ${productvariant}" + } + } + + if (pp) { + def productrelease = new ProductRelease(sha, + productreleasemeta.jenkinsbuildinfo.builddate, + tags) + echo "Productrelease: ${productrelease.sha} created" + parseproductdependencies(productcollection, + productreleasemeta, + productreleasefolder, + productvariant, + productrelease) + echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" + pp.addProductRelease(productrelease) } - - def productrelease = new ProductRelease(sha, - productreleasemeta.jenkinsbuildinfo.builddate, - tags) - echo "Productrelease: ${productrelease.sha} created" - parseproductdependencies(productcollection, - productreleasemeta, - productreleasefolder, - productvariant, - productrelease) - echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" - pp.addProductRelease(productrelease) } - pp.markparsed() - echo "Productvariant: ${pp.productvariant} parsed" + if (pp) { + pp.markparsed() + echo "Productvariant: ${pp.productvariant} parsed" + } } def iterateinitialproductrepos(initialproductcollection, From 94de9d206995b15c09831b5e1742dacca3baa58c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 22:35:03 +0000 Subject: [PATCH 16/31] Debug sha/tags table --- product/info.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index bbda541..2c15937 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -111,7 +111,6 @@ def ProductParsed addProductEntry(LinkedHashMap productco String releaserepo) { def ProductParsed productparsed - echo "Attempting to add product variant: ${productvariant} releaserepo: ${releaserepo}" if (productvariant && releaserepo) { if (productcollection.get(releaserepo) == null) { // Use the first entry name only echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" @@ -186,7 +185,6 @@ def parseproductrepo(LinkedHashMap productcollection, git checkout ${sha} """, returnStatus: true) - echo "returnstatus: ${returnstatus}" if (returnstatus > 0) { dir('meta') { deleteDir() From cd0a35359a6e6841c56768d7afaab4d86b373001 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 22:40:12 +0000 Subject: [PATCH 17/31] Debug sha/tags table --- meta/folder.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 67ca47a..810fc4f 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -817,20 +817,20 @@ class MetaInfo extends GISJsonSerialised { String relativize(String mypath) { String pathRelative - script.echo("Seeing if ${mypath} begins with ${script.WORKSPACE}") + //script.echo("Seeing if ${mypath} begins with ${script.WORKSPACE}") if (mypath.startsWith(script.WORKSPACE)) { pathRelative = mypath.minus(script.WORKSPACE) - script.echo("Extracted ${pathRelative} from ${script.WORKSPACE} and ${mypath}") + //script.echo("Extracted ${pathRelative} from ${script.WORKSPACE} and ${mypath}") } else { pathRelative = mypath - script.echo("Path relative is unchanged: ${pathRelative}") + //script.echo("Path relative is unchanged: ${pathRelative}") } // Convert \ with / pathRelative = pathRelative.tokenize('\\').join('/') // Strip leading / if any pathRelative = pathRelative.replaceAll('^/+', '') - script.echo("Path relative is ${pathRelative}") + //script.echo("Path relative is ${pathRelative}") return pathRelative } From 839f987a81341fbc84f909c7ed79b19bf84da321 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 22:50:00 +0000 Subject: [PATCH 18/31] Debug sha/tags table --- meta/folder.groovy | 2 +- product/info.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 810fc4f..34448dd 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -845,7 +845,7 @@ class MetaInfo extends GISJsonSerialised { def String adjustedpath = relativize(destpath) def importedmetafile = adjustedpath + "/" + metafilepath() if (script.fileExists(importedmetafile)) { - script.echo("Deserialising meta at file: ${importedmetafile} (destpath: ${destpath})") + //script.echo("Deserialising meta at file: ${importedmetafile} (destpath: ${destpath})") mi.deserialiseJson(importedmetafile) RelatedMetaInfo rmi = new RelatedMetaInfo_v0_2(script, importedmetafile, adjustedpath, mi.productinfo.uniqueid) diff --git a/product/info.groovy b/product/info.groovy index 2c15937..0ae2779 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -179,7 +179,7 @@ def parseproductrepo(LinkedHashMap productcollection, def String productvariant def ProductParsed pp shatagmap.each { sha, tags -> - echo "Sha: ${sha} has tags: ${tags}" + //echo "Sha: ${sha} has tags: ${tags}" dir(productreleasefolder) { def returnstatus = sh( script: """#!/bin/bash git checkout ${sha} From ab4165ebc0e3a679da1c7a343671efb93bf002b4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 23:22:12 +0000 Subject: [PATCH 19/31] Debug sha/tags table --- product/info.groovy | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 0ae2779..5a1dfaf 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -134,29 +134,33 @@ def parseproductdependencies(LinkedHashMap productcollect def dependentmeta = productreleasemeta.getassociated(productreleasefolder) for (meta in dependentmeta) { - def pd = new ProductDependency(this, - rt, - meta.productvariant(), - meta.releasetag(), - meta.releaseinfo.releaserepoURL) - pd.setreleasestate() - if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { - if (meta.productvariant() != containingproductvariant) { // Don't add myself + if (meta.productvariant() && meta.productinfo.subcomponentname) { + def pd = new ProductDependency(this, + rt, + meta.productvariant(), + meta.releasetag(), + meta.releaseinfo.releaserepoURL) + pd.setreleasestate() + if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { + if (meta.productvariant() != containingproductvariant) { // Don't add myself + addProductEntry(productcollection, + meta.productvariant(), + meta.releaseinfo.releaserepoURL) + productrelease.addProductDependency(pd) + } + } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) + } else { + def pc = new ProductComponent(meta.productinfo.subcomponentname, + meta.releasetag(), + meta.releaseinfo.releaserepoURL) + productrelease.addProductComponent(pc) } - } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { - addProductEntry(productcollection, - meta.productvariant(), - meta.releaseinfo.releaserepoURL) - productrelease.addProductDependency(pd) } else { - def pc = new ProductComponent(meta.productinfo.subcomponentname, - meta.releasetag(), - meta.releaseinfo.releaserepoURL) - productrelease.addProductComponent(pc) + echo "Ignoring unnamed dependency in ${productreleasemeta.productvariant()}" } } } From 8aeb9a930b80659460d3e3b321c965957d5d2cb6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 10:06:48 +0000 Subject: [PATCH 20/31] Debug sha/tags table --- product/info.groovy | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 5a1dfaf..3f55ed8 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -170,14 +170,28 @@ def parseproductrepo(LinkedHashMap productcollection, String productreleasefolder) { dir(productreleasefolder) { deleteDir() - sh """#!/bin/bash - git init - git config remote.origin.url ${productrepo} - git config advice.detachedHead false - git sparse-checkout init - git sparse-checkout set meta/* - git pull -t - """ + def returnstatus = sh(script: """#!/bin/bash + git init + if [ \$? -ne 0 ]; then exit 1; fi + git config remote.origin.url ${productrepo} + if [ \$? -ne 0 ]; then exit 1; fi + git config advice.detachedHead false + if [ \$? -ne 0 ]; then exit 1; fi + git sparse-checkout init + if [ \$? -ne 0 ]; then exit 1; fi + git sparse-checkout set meta/* + if [ \$? -ne 0 ]; then exit 1; fi + git pull -t + if [ \$? -ne 0 ]; then exit 1; fi + """, + returnStatus: true) + if (returnstatus > 0) { + dir('meta') { + deleteDir() + } + echo "Couldn't clone repository: ${productrepo} correctly" + return + } } def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) def String productvariant @@ -185,10 +199,10 @@ def parseproductrepo(LinkedHashMap productcollection, shatagmap.each { sha, tags -> //echo "Sha: ${sha} has tags: ${tags}" dir(productreleasefolder) { - def returnstatus = sh( script: """#!/bin/bash - git checkout ${sha} - """, - returnStatus: true) + def returnstatus = sh(script: """#!/bin/bash + git checkout ${sha} + """, + returnStatus: true) if (returnstatus > 0) { dir('meta') { deleteDir() From 295c18c0bbe9cb5207ff75f7ba95493b6193910c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 18:14:28 +0000 Subject: [PATCH 21/31] Debug sha/tags table --- product/info.groovy | 83 +++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 3f55ed8..28107de 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -168,6 +168,7 @@ def parseproductdependencies(LinkedHashMap productcollect def parseproductrepo(LinkedHashMap productcollection, String productrepo, String productreleasefolder) { + def boolean productrepogood = true dir(productreleasefolder) { deleteDir() def returnstatus = sh(script: """#!/bin/bash @@ -190,56 +191,58 @@ def parseproductrepo(LinkedHashMap productcollection, deleteDir() } echo "Couldn't clone repository: ${productrepo} correctly" - return + productrepogood = false } } - def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) - def String productvariant - def ProductParsed pp - shatagmap.each { sha, tags -> - //echo "Sha: ${sha} has tags: ${tags}" - dir(productreleasefolder) { - def returnstatus = sh(script: """#!/bin/bash - git checkout ${sha} - """, - returnStatus: true) - if (returnstatus > 0) { - dir('meta') { - deleteDir() + if (productrepogood) { + def LinkedHashMap> shatagmap = gh.getremoteshatagmap(productrepo) + def String productvariant + def ProductParsed pp + shatagmap.each { sha, tags -> + //echo "Sha: ${sha} has tags: ${tags}" + dir(productreleasefolder) { + def returnstatus = sh(script: """#!/bin/bash + git checkout ${sha} + """, + returnStatus: true) + if (returnstatus > 0) { + dir('meta') { + deleteDir() + } } } - } - def productreleasemeta = meta.importrelated(false, productreleasefolder) - if (!productvariant) { - productvariant = productreleasemeta.productvariant() - pp = addProductEntry(productcollection, - productvariant, - productrepo) + def productreleasemeta = meta.importrelated(false, productreleasefolder) + if (!productvariant) { + productvariant = productreleasemeta.productvariant() + pp = addProductEntry(productcollection, + productvariant, + productrepo) + if (pp) { + echo "Productvariant: ${pp.productvariant} created" + } else { + echo "No product entry added/associated with ${productvariant}" + } + } + if (pp) { - echo "Productvariant: ${pp.productvariant} created" - } else { - echo "No product entry added/associated with ${productvariant}" + def productrelease = new ProductRelease(sha, + productreleasemeta.jenkinsbuildinfo.builddate, + tags) + echo "Productrelease: ${productrelease.sha} created" + parseproductdependencies(productcollection, + productreleasemeta, + productreleasefolder, + productvariant, + productrelease) + echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" + pp.addProductRelease(productrelease) } } - if (pp) { - def productrelease = new ProductRelease(sha, - productreleasemeta.jenkinsbuildinfo.builddate, - tags) - echo "Productrelease: ${productrelease.sha} created" - parseproductdependencies(productcollection, - productreleasemeta, - productreleasefolder, - productvariant, - productrelease) - echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" - pp.addProductRelease(productrelease) + pp.markparsed() + echo "Productvariant: ${pp.productvariant} parsed" } } - if (pp) { - pp.markparsed() - echo "Productvariant: ${pp.productvariant} parsed" - } } def iterateinitialproductrepos(initialproductcollection, From e72f0067281fb4ecdc429d069aee9d5218c339a7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 18:21:46 +0000 Subject: [PATCH 22/31] Debug sha/tags table --- product/info.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 28107de..e89922a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -169,6 +169,7 @@ def parseproductrepo(LinkedHashMap productcollection, String productrepo, String productreleasefolder) { def boolean productrepogood = true + echo "Querying repo: ${productrepo}" dir(productreleasefolder) { deleteDir() def returnstatus = sh(script: """#!/bin/bash @@ -249,7 +250,6 @@ def iterateinitialproductrepos(initialproductcollection, LinkedHashMap productcollection, String productreleasefolder) { for (productrepo in initialproductcollection.ProductReleaseRepos) { - echo "Querying ${productrepo}" parseproductrepo(productcollection, productrepo, productreleasefolder) @@ -259,7 +259,6 @@ def iterateinitialproductrepos(initialproductcollection, echo "Parsing extra products" productcollection.each { releaserepo, productparsed -> if (!productparsed.parsed()) { - echo "Querying unparsed ${productparsed.productvariant}" allparsed = false parseproductrepo(productcollection, releaserepo, From bf4a42881b624cffd3a9507b75f9d636ea405367 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 19:05:47 +0000 Subject: [PATCH 23/31] Debug sha/tags table --- product/info.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index e89922a..61e2740 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -106,6 +106,10 @@ class ProductParsed { } } +def String translateproductvariant(String productvariant) { + +} + def ProductParsed addProductEntry(LinkedHashMap productcollection, String productvariant, String releaserepo) { @@ -113,15 +117,15 @@ def ProductParsed addProductEntry(LinkedHashMap productco if (productvariant && releaserepo) { if (productcollection.get(releaserepo) == null) { // Use the first entry name only - echo "Adding product variant: ${productvariant} releaserepo: ${releaserepo}" + echo "Adding product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})" productparsed = new ProductParsed(productvariant) productcollection.put(releaserepo, productparsed) } else { - echo "Already added product variant: ${productvariant}" + echo "Already added product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})" } productparsed = productcollection.get(releaserepo) } else { - echo "Not adding product variant: ${productvariant} releaserepo: ${releaserepo}" + echo "Not adding product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})" } return productparsed } From 14b1eff631cfcafb1343b5ee7a20c546c7106046 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:04:15 +0000 Subject: [PATCH 24/31] Provide a product variant translation table --- product/info.groovy | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 61e2740..c991f61 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -106,11 +106,19 @@ class ProductParsed { } } -def String translateproductvariant(String productvariant) { - +def String translateproductvariant(LinkedHashMap productvarianttranslation, + String releaserepo, + String productvariant) { + def translatedproductvariant = productvarianttranslation.get(releaserepo) + if (translatedproductvariant != null) { + echo "Translating product variant: ${productvariant} to: ${translatedproductvariant}" + return translatedproductvariant + } + return productvariant } def ProductParsed addProductEntry(LinkedHashMap productcollection, + LinkedHashMap productvarianttranslation, String productvariant, String releaserepo) { def ProductParsed productparsed @@ -118,7 +126,10 @@ def ProductParsed addProductEntry(LinkedHashMap productco if (productvariant && releaserepo) { if (productcollection.get(releaserepo) == null) { // Use the first entry name only echo "Adding product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})" - productparsed = new ProductParsed(productvariant) + def translatedproductvariant = translateproductvariant(productvarianttranslation, + releaserepo, + productvariant) + productparsed = new ProductParsed(translatedproductvariant) productcollection.put(releaserepo, productparsed) } else { echo "Already added product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})" @@ -131,6 +142,7 @@ def ProductParsed addProductEntry(LinkedHashMap productco } def parseproductdependencies(LinkedHashMap productcollection, + LinkedHashMap productvarianttranslation productreleasemeta, String productreleasefolder, String containingproductvariant, @@ -148,12 +160,14 @@ def parseproductdependencies(LinkedHashMap productcollect if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { if (meta.productvariant() != containingproductvariant) { // Don't add myself addProductEntry(productcollection, + productvarianttranslation, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { addProductEntry(productcollection, + productvarianttranslation, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) @@ -170,6 +184,7 @@ def parseproductdependencies(LinkedHashMap productcollect } def parseproductrepo(LinkedHashMap productcollection, + LinkedHashMap productvarianttranslation, String productrepo, String productreleasefolder) { def boolean productrepogood = true @@ -220,6 +235,7 @@ def parseproductrepo(LinkedHashMap productcollection, if (!productvariant) { productvariant = productreleasemeta.productvariant() pp = addProductEntry(productcollection, + productvarianttranslation, productvariant, productrepo) if (pp) { @@ -235,6 +251,7 @@ def parseproductrepo(LinkedHashMap productcollection, tags) echo "Productrelease: ${productrelease.sha} created" parseproductdependencies(productcollection, + productvarianttranslation, productreleasemeta, productreleasefolder, productvariant, @@ -252,9 +269,11 @@ def parseproductrepo(LinkedHashMap productcollection, def iterateinitialproductrepos(initialproductcollection, LinkedHashMap productcollection, + LinkedHashMap productvarianttranslation, String productreleasefolder) { for (productrepo in initialproductcollection.ProductReleaseRepos) { parseproductrepo(productcollection, + productvarianttranslation, productrepo, productreleasefolder) } @@ -265,6 +284,7 @@ def iterateinitialproductrepos(initialproductcollection, if (!productparsed.parsed()) { allparsed = false parseproductrepo(productcollection, + productvarianttranslation, releaserepo, productreleasefolder) } else { @@ -282,5 +302,4 @@ def LinkedHashMap getNewProductCollection() { return new LinkedHashMap() } - return this \ No newline at end of file From ba8062d97e25e9e646bf289de27000defc158ce3 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:05:47 +0000 Subject: [PATCH 25/31] Provide a product variant translation table --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index c991f61..44240b9 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -142,7 +142,7 @@ def ProductParsed addProductEntry(LinkedHashMap productco } def parseproductdependencies(LinkedHashMap productcollection, - LinkedHashMap productvarianttranslation + LinkedHashMap productvarianttranslation, productreleasemeta, String productreleasefolder, String containingproductvariant, From 58d69909ef3caa9b23b24e5c5d752760368e9986 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:07:53 +0000 Subject: [PATCH 26/31] Provide a product variant translation table --- product/info.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/info.groovy b/product/info.groovy index 44240b9..d1f652a 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -268,8 +268,8 @@ def parseproductrepo(LinkedHashMap productcollection, } def iterateinitialproductrepos(initialproductcollection, - LinkedHashMap productcollection, LinkedHashMap productvarianttranslation, + LinkedHashMap productcollection, String productreleasefolder) { for (productrepo in initialproductcollection.ProductReleaseRepos) { parseproductrepo(productcollection, From 3e317a5d3daed560cdd64bfb2e49be400ef310b8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:23:43 +0000 Subject: [PATCH 27/31] Provide a product variant translation table --- product/info.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index d1f652a..937b22c 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -106,7 +106,7 @@ class ProductParsed { } } -def String translateproductvariant(LinkedHashMap productvarianttranslation, +def String translateproductvariant(productvarianttranslation, String releaserepo, String productvariant) { def translatedproductvariant = productvarianttranslation.get(releaserepo) @@ -118,7 +118,7 @@ def String translateproductvariant(LinkedHashMap productvariantt } def ProductParsed addProductEntry(LinkedHashMap productcollection, - LinkedHashMap productvarianttranslation, + productvarianttranslation, String productvariant, String releaserepo) { def ProductParsed productparsed @@ -142,7 +142,7 @@ def ProductParsed addProductEntry(LinkedHashMap productco } def parseproductdependencies(LinkedHashMap productcollection, - LinkedHashMap productvarianttranslation, + productvarianttranslation, productreleasemeta, String productreleasefolder, String containingproductvariant, @@ -184,7 +184,7 @@ def parseproductdependencies(LinkedHashMap productcollect } def parseproductrepo(LinkedHashMap productcollection, - LinkedHashMap productvarianttranslation, + productvarianttranslation, String productrepo, String productreleasefolder) { def boolean productrepogood = true @@ -268,7 +268,7 @@ def parseproductrepo(LinkedHashMap productcollection, } def iterateinitialproductrepos(initialproductcollection, - LinkedHashMap productvarianttranslation, + productvarianttranslation, LinkedHashMap productcollection, String productreleasefolder) { for (productrepo in initialproductcollection.ProductReleaseRepos) { From 5db7c8dd22cfb8d0b4dfa94f56c53fac2e35b65b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:33:17 +0000 Subject: [PATCH 28/31] Provide a product variant translation table --- product/info.groovy | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 937b22c..c6cccff 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -150,25 +150,28 @@ def parseproductdependencies(LinkedHashMap productcollect def dependentmeta = productreleasemeta.getassociated(productreleasefolder) for (meta in dependentmeta) { - if (meta.productvariant() && meta.productinfo.subcomponentname) { + def translatedproductvariant = translateproductvariant(productvarianttranslation, + releaserepo, + meta.productvariant()) + if (translatedproductvariant && meta.productinfo.subcomponentname) { def pd = new ProductDependency(this, rt, - meta.productvariant(), + translatedproductvariant, meta.releasetag(), meta.releaseinfo.releaserepoURL) pd.setreleasestate() - if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { - if (meta.productvariant() != containingproductvariant) { // Don't add myself + if (meta.productinfo.subcomponentname == 'WHOLE' && translatedproductvariant) { + if (translatedproductvariant != containingproductvariant) { // Don't add myself addProductEntry(productcollection, productvarianttranslation, - meta.productvariant(), + translatedproductvariant, meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } - } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { + } else if (translatedproductvariant != containingproductvariant && translatedproductvariant) { addProductEntry(productcollection, productvarianttranslation, - meta.productvariant(), + translatedproductvariant, meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } else { From 806f098ac64bac602802892659f2bf7fa155558c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:38:50 +0000 Subject: [PATCH 29/31] Provide a product variant translation table --- product/info.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index c6cccff..1d22cb0 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -151,7 +151,7 @@ def parseproductdependencies(LinkedHashMap productcollect for (meta in dependentmeta) { def translatedproductvariant = translateproductvariant(productvarianttranslation, - releaserepo, + meta.releaseinfo.releaserepoURL, meta.productvariant()) if (translatedproductvariant && meta.productinfo.subcomponentname) { def pd = new ProductDependency(this, @@ -257,7 +257,7 @@ def parseproductrepo(LinkedHashMap productcollection, productvarianttranslation, productreleasemeta, productreleasefolder, - productvariant, + pp.productvariant, productrelease) echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}" pp.addProductRelease(productrelease) From 2e74b329a610a494ed8a3979bca5f24d0940e040 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:53:33 +0000 Subject: [PATCH 30/31] Provide a product variant translation table --- product/info.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 1d22cb0..4ff347b 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -242,9 +242,9 @@ def parseproductrepo(LinkedHashMap productcollection, productvariant, productrepo) if (pp) { - echo "Productvariant: ${pp.productvariant} created" + echo "Product variant created for: ${productrepo} name: ${pp.productvariant}" } else { - echo "No product entry added/associated with ${productvariant}" + echo "No product entry added/associated with ${productrepo} name: ${productvariant}" } } From 2ae44ffdcd5cbad80fea76cb895f17c1a7828c08 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 22:19:51 +0000 Subject: [PATCH 31/31] Use productvariant() instead of .productinfo.productname --- differences/dometahierarchy.groovy | 16 ++++++++-------- documentation/doxygen_deploy.groovy | 6 +++--- publish/do.groovy | 6 +++--- release/do.groovy | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/differences/dometahierarchy.groovy b/differences/dometahierarchy.groovy index 3b25798..34a7dfe 100644 --- a/differences/dometahierarchy.groovy +++ b/differences/dometahierarchy.groovy @@ -27,7 +27,7 @@ class JiraTicketInfo { } class DifferenceRecord { - String productname + String productvariant String subcomponentname String rawdifferencetext @@ -39,7 +39,7 @@ class DifferenceRecord { String comment DifferenceRecord() { - productname = "" + productvariant = "" subcomponentname = "" rawdifferencetext = "" @@ -130,7 +130,7 @@ def boolean checkoutsourcerepo(buildmeta, String checkoutfolder) { } def String getcomponent(meta) { - def String uniquefolder = "${meta.productinfo.productname}_${meta.productinfo.subcomponentname}" + def String uniquefolder = "${meta.productvariant()}_${meta.productinfo.subcomponentname}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}" @@ -343,7 +343,7 @@ def List fillrecord(meta, line, String sourcepath) { def List differencerecords = [] def DifferenceRecord dr = new DifferenceRecord() - dr.productname = meta.productinfo.productname + dr.productvariant = meta.productvariant() dr.subcomponentname = meta.productinfo.subcomponentname dr.rawdifferencetext = line @@ -755,7 +755,7 @@ def boolean report(meta, title, differencerecords, boolean iscomponent = true) { def title(earlymeta, latermeta) { return """ Differences in: - Product: ${earlymeta.productinfo.productname} Subcomponent: ${earlymeta.productinfo.subcomponentname} + Product: ${earlymeta.productvariant()} Subcomponent: ${earlymeta.productinfo.subcomponentname} between: then: Build date: ${earlymeta.jenkinsbuildinfo.builddate} Build stamp: ${earlymeta.buildstampinfo.buildstamp} Git revision: ${earlymeta.gitinfo.gitrevision} @@ -771,7 +771,7 @@ def compare(earlymetaitems, latermetaitems, key) { def earlymeta = earlymetaitems[key].metainfo def latermeta = latermetaitems[key].metainfo - summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: Changed: ") + summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: Changed: ") def boolean repoavailable def String uniquefolderforsourcerepo @@ -817,14 +817,14 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin (result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key) differencerecords = differencerecords + componentdifferencerecords } else { - summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ") + summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: ") deletedcomponent(earlymetaitems, key) summaryappend("\n") } } for (key in latermetaitems.keySet()) { if (!earlymetaitems.containsKey(key)) { - summaryappend("${latermeta.productinfo.productname} ${latermeta.productinfo.subcomponentname}: ") + summaryappend("${latermeta.productvariant()} ${latermeta.productinfo.subcomponentname}: ") addedcomponent(latermetaitems, key) summaryappend("\n") } diff --git a/documentation/doxygen_deploy.groovy b/documentation/doxygen_deploy.groovy index 5054c02..e2f74a7 100644 --- a/documentation/doxygen_deploy.groovy +++ b/documentation/doxygen_deploy.groovy @@ -30,10 +30,10 @@ pipeline { importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN) - productname = doxygenmeta.productinfo.productname + productvariant = doxygenmeta.productvariant() buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix - echo "Doyxgen imported for product: ${productname} and build stamp prefix: ${buildstampprefix}" + echo "Doyxgen imported for product: ${productvariant} and build stamp prefix: ${buildstampprefix}" } } } @@ -41,7 +41,7 @@ pipeline { steps { script { doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" - pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productname}/${buildstampprefix}" + pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productvariant}/${buildstampprefix}" echo "Copying from ${doxygensource} to ${pathonserver}" if (isUnix()) { sh """#!/bin/bash diff --git a/publish/do.groovy b/publish/do.groovy index ea090f0..8e302d8 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -22,7 +22,7 @@ def resetfolders() { } def productuniquefolder(releasemeta) { - return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" + return "${releasemeta.productvariant()}_${releasemeta.productinfo.subcomponentname}" } def uniquereleasefolder(String productline, String softwarerelease, releasemeta) { @@ -116,7 +116,7 @@ def recallcomponent(String productline, releaseinfo, String softwarerelease, ite def releasemeta = releaseinfo.metainfo def String uniquefolderforrepo = uniqueabsoluterreleasefolder(productline, releaserepofolder, softwarerelease, releasemeta) - summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ") + summaryappend("${releasemeta.productvariant()} ${releasemeta.productinfo.subcomponentname}: ") getcomponentartifacts(releaseinfo, uniquefolderforrepo, itempathstopublish) @@ -145,7 +145,7 @@ def publishhierarchy(hostedftpsiteinfo, releasemeta, String releasemetapath, Str resetfolders() preconditions() - def productline = releasemeta.productinfo.productname + def productline = releasemeta.productvariant() // Walk the meta information to a max depth, looking for artifacts to publish def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md, '', releasemetapath) diff --git a/release/do.groovy b/release/do.groovy index 4dcb091..05de91f 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -191,7 +191,7 @@ def ArrayList maketaglist(buildmeta, String buildstamp, String otherrele def ArrayList othertaglist = otherreleasetags.split(',') for (othertagitem in othertaglist) { if (othertagitem?.trim()) { - def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}" + def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productvariant()}_${buildmeta.productinfo.subcomponentname}" taglist.add(componentothertagitem) } } @@ -377,13 +377,13 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) { def buildmeta = buildinfo.metainfo def uriconverted = gh.uniquereporootname(buildmeta.gitinfo.remoteurl) - def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${uriconverted}" + def String uniquefolder = "${buildmeta.productvariant()}_${buildmeta.productinfo.subcomponentname}_${uriconverted}" def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}" - summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") - repoandtagsappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") + summaryappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ") + repoandtagsappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ") def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo) checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)