diff --git a/product/info.groovy b/product/info.groovy index 6f5ec2b..afc8da4 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -4,28 +4,35 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") rt = load("${autobuilder.commonscripts()}/release/tag.groovy") class ProductDependency { + private script + private rtscript private String productvariant private String releaserepo private String releasetag private String releasestate - def ProductDependency(String productvariant, + def ProductDependency(script, + rtscript, + String productvariant, String releasetag, String releaserepo) { + this.script = script + this.rtscript = rtscript this.productvariant = productvariant this.releaserepo = releaserepo this.releasetag = releasetag this.releasestate = '' } - def setreleasestate(rtscript) { + def setreleasestate() { def LinkedHashMap results = rtscript.startswithspecialprefix(releasetag) + script.echo("results is: ${results.dump()}") if (results.hasspecialprefix) { - this.releasetag = results.tagwithoutprefix - this.releasestate = results.prefixfound + releasetag = results.tagwithoutprefix + releasestate = results.prefixfound } else { - this.releasetag = results.tagwithoutprefix - this.releasestate = '' + releasetag = results.tagwithoutprefix + releasestate = '' } } } @@ -174,11 +181,13 @@ def iterateinitialproductrepos(script, def String productvariant = 'HMBFDHV_sg1024' def String releasetag = 'inmainline_1.2.3.4_54' def releaserepo = 'git@hydra/blah.git' - def pd = new ProductDependency(productvariant, + def pd = new ProductDependency(script, + rt, + productvariant, releasetag, releaserepo) - pd.setreleasestate(rt) - script.echo("pd is: ${pd.dump()}") + pd.setreleasestate() + script.echo("pd is: ${pd.dump()}") /* parseproductrepo(productrepo,