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,