From 01d91a7ec10461804df652b6fb6e774e36f4b83b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 26 Feb 2022 16:24:19 +0000 Subject: [PATCH] Debugging script --- product/info.groovy | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 7058c9d..be95978 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -105,7 +105,6 @@ class ProductParsed { def LinkedHashMap products = new LinkedHashMap() -/* def addProductEntry(LinkedHashMap products, String productvariant, String releaserepo) { @@ -119,8 +118,7 @@ def addProductEntry(LinkedHashMap products, return productparsed } -def parseproductdependencies(rt, - productreleasemeta, +def parseproductdependencies(productreleasemeta, String productreleasefolder, String containingproductvariant, ProductRelease productrelease, @@ -135,10 +133,12 @@ def parseproductdependencies(rt, productrelease.addProductComponent(pc) } else { if (meta.productvariant() != containingproductvariant) { - def pd = new ProductDependency(meta.productvariant(), + def pd = new ProductDependency(this, + rt, + meta.productvariant(), meta.releasetag(), meta.releaseinfo.releaserepoURL) - pd.setreleasestate(rt) + pd.setreleasestate() addProductEntry(products, meta.productvariant(), meta.releaseinfo.releaserepoURL) @@ -159,43 +159,36 @@ def parseproductrepo(String productrepo, def importoptions = importer.getNewImportOptions() importoptions.releaserepo(productrepo, sha) importoptions.setfilter('meta/**') - def productreleasemeta = importer.artifactimport(meta, importoptions, productreleasefolder) + def productreleasemeta = importer.artifactimport(meta, + importoptions, + productreleasefolder) if (!productvariant) { productvariant = productreleasemeta.productvariant() pp = addProductEntry(productvariant, productrepo) } - def productrelease = new ProductRelease(sha, productreleasemeta.jenkinsbuildinfo.builddate, tags) - parseproductdependencies(productreleasemeta, productreleasefolder, productvariant, productrelease, products) + def productrelease = new ProductRelease(sha, + productreleasemeta.jenkinsbuildinfo.builddate, + tags) + parseproductdependencies(productreleasemeta, + productreleasefolder, + productvariant, + productrelease, + products) pp.addProductRelease(productrelease) } pp.markparsed() } -*/ def iterateinitialproductrepos(script, productcollection, String productreleasefolder) { -/* for (productrepo in productcollection.ProductReleaseRepos) { + for (productrepo in productcollection.ProductReleaseRepos) { echo "Querying ${productrepo}" -*/ - def String productvariant = 'HMBFDHV_sg1024' - def String releasetag = 'inmainline_1.2.3.4_54' - def releaserepo = 'git@hydra/blah.git' - def pd = new ProductDependency(script, - rt, - productvariant, - releasetag, - releaserepo) - pd.setreleasestate() - script.echo("pd is: ${pd.dump()}") - - /* parseproductrepo(productrepo, productreleasefolder) } - /* while( true ) { boolean allparsed = true products.each { releaserepo, productparsed -> @@ -207,7 +200,6 @@ def iterateinitialproductrepos(script, } if (allparsed) break } - */ } return this \ No newline at end of file