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,