Provide a product variant translation table
This commit is contained in:
parent
bf4a42881b
commit
14b1eff631
1 changed files with 23 additions and 4 deletions
|
|
@ -106,11 +106,19 @@ class ProductParsed {
|
|||
}
|
||||
}
|
||||
|
||||
def String translateproductvariant(String productvariant) {
|
||||
|
||||
def String translateproductvariant(LinkedHashMap<String, String> 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<String, ProductParsed> productcollection,
|
||||
LinkedHashMap<String, String> productvarianttranslation,
|
||||
String productvariant,
|
||||
String releaserepo) {
|
||||
def ProductParsed productparsed
|
||||
|
|
@ -118,7 +126,10 @@ def ProductParsed addProductEntry(LinkedHashMap<String, ProductParsed> 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<String, ProductParsed> productco
|
|||
}
|
||||
|
||||
def parseproductdependencies(LinkedHashMap<String, ProductParsed> productcollection,
|
||||
LinkedHashMap<String, String> productvarianttranslation
|
||||
productreleasemeta,
|
||||
String productreleasefolder,
|
||||
String containingproductvariant,
|
||||
|
|
@ -148,12 +160,14 @@ def parseproductdependencies(LinkedHashMap<String, ProductParsed> 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<String, ProductParsed> productcollect
|
|||
}
|
||||
|
||||
def parseproductrepo(LinkedHashMap<String, ProductParsed> productcollection,
|
||||
LinkedHashMap<String, String> productvarianttranslation,
|
||||
String productrepo,
|
||||
String productreleasefolder) {
|
||||
def boolean productrepogood = true
|
||||
|
|
@ -220,6 +235,7 @@ def parseproductrepo(LinkedHashMap<String, ProductParsed> productcollection,
|
|||
if (!productvariant) {
|
||||
productvariant = productreleasemeta.productvariant()
|
||||
pp = addProductEntry(productcollection,
|
||||
productvarianttranslation,
|
||||
productvariant,
|
||||
productrepo)
|
||||
if (pp) {
|
||||
|
|
@ -235,6 +251,7 @@ def parseproductrepo(LinkedHashMap<String, ProductParsed> productcollection,
|
|||
tags)
|
||||
echo "Productrelease: ${productrelease.sha} created"
|
||||
parseproductdependencies(productcollection,
|
||||
productvarianttranslation,
|
||||
productreleasemeta,
|
||||
productreleasefolder,
|
||||
productvariant,
|
||||
|
|
@ -252,9 +269,11 @@ def parseproductrepo(LinkedHashMap<String, ProductParsed> productcollection,
|
|||
|
||||
def iterateinitialproductrepos(initialproductcollection,
|
||||
LinkedHashMap<String, ProductParsed> productcollection,
|
||||
LinkedHashMap<String, String> 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<String, ProductParsed> getNewProductCollection() {
|
|||
return new LinkedHashMap<String, ProductParsed>()
|
||||
}
|
||||
|
||||
|
||||
return this
|
||||
Loading…
Add table
Add a link
Reference in a new issue