Merge commit 'a29f25f7be570e0c07a12f35055f8818cef47fa7' into production

This commit is contained in:
Dan Hawkins 2022-03-13 22:39:20 +00:00
commit 83257ea632
7 changed files with 178 additions and 85 deletions

View file

@ -27,7 +27,7 @@ class JiraTicketInfo {
}
class DifferenceRecord {
String productname
String productvariant
String subcomponentname
String rawdifferencetext
@ -39,7 +39,7 @@ class DifferenceRecord {
String comment
DifferenceRecord() {
productname = ""
productvariant = ""
subcomponentname = ""
rawdifferencetext = ""
@ -130,7 +130,7 @@ def boolean checkoutsourcerepo(buildmeta, String checkoutfolder) {
}
def String getcomponent(meta) {
def String uniquefolder = "${meta.productinfo.productname}_${meta.productinfo.subcomponentname}"
def String uniquefolder = "${meta.productvariant()}_${meta.productinfo.subcomponentname}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
@ -343,7 +343,7 @@ def List fillrecord(meta, line, String sourcepath) {
def List differencerecords = []
def DifferenceRecord dr = new DifferenceRecord()
dr.productname = meta.productinfo.productname
dr.productvariant = meta.productvariant()
dr.subcomponentname = meta.productinfo.subcomponentname
dr.rawdifferencetext = line
@ -755,7 +755,7 @@ def boolean report(meta, title, differencerecords, boolean iscomponent = true) {
def title(earlymeta, latermeta) {
return """
Differences in:
Product: ${earlymeta.productinfo.productname} Subcomponent: ${earlymeta.productinfo.subcomponentname}
Product: ${earlymeta.productvariant()} Subcomponent: ${earlymeta.productinfo.subcomponentname}
between:
then:
Build date: ${earlymeta.jenkinsbuildinfo.builddate} Build stamp: ${earlymeta.buildstampinfo.buildstamp} Git revision: ${earlymeta.gitinfo.gitrevision}
@ -771,7 +771,7 @@ def compare(earlymetaitems, latermetaitems, key) {
def earlymeta = earlymetaitems[key].metainfo
def latermeta = latermetaitems[key].metainfo
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: Changed: ")
summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: Changed: ")
def boolean repoavailable
def String uniquefolderforsourcerepo
@ -817,14 +817,14 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
(result, componentdifferencerecords) = compare(earlymetaitems, latermetaitems, key)
differencerecords = differencerecords + componentdifferencerecords
} else {
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: ")
summaryappend("${earlymeta.productvariant()} ${earlymeta.productinfo.subcomponentname}: ")
deletedcomponent(earlymetaitems, key)
summaryappend("\n")
}
}
for (key in latermetaitems.keySet()) {
if (!earlymetaitems.containsKey(key)) {
summaryappend("${latermeta.productinfo.productname} ${latermeta.productinfo.subcomponentname}: ")
summaryappend("${latermeta.productvariant()} ${latermeta.productinfo.subcomponentname}: ")
addedcomponent(latermetaitems, key)
summaryappend("\n")
}

View file

@ -30,10 +30,10 @@ pipeline {
importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**')
doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN)
productname = doxygenmeta.productinfo.productname
productvariant = doxygenmeta.productvariant()
buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix
echo "Doyxgen imported for product: ${productname} and build stamp prefix: ${buildstampprefix}"
echo "Doyxgen imported for product: ${productvariant} and build stamp prefix: ${buildstampprefix}"
}
}
}
@ -41,7 +41,7 @@ pipeline {
steps {
script {
doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}"
pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productname}/${buildstampprefix}"
pathonserver = "${ROOT_PATH_ON_SERVER.trim()}/${productvariant}/${buildstampprefix}"
echo "Copying from ${doxygensource} to ${pathonserver}"
if (isUnix()) {
sh """#!/bin/bash

View file

@ -817,20 +817,20 @@ class MetaInfo extends GISJsonSerialised {
String relativize(String mypath) {
String pathRelative
script.echo("Seeing if ${mypath} begins with ${script.WORKSPACE}")
//script.echo("Seeing if ${mypath} begins with ${script.WORKSPACE}")
if (mypath.startsWith(script.WORKSPACE)) {
pathRelative = mypath.minus(script.WORKSPACE)
script.echo("Extracted ${pathRelative} from ${script.WORKSPACE} and ${mypath}")
//script.echo("Extracted ${pathRelative} from ${script.WORKSPACE} and ${mypath}")
} else {
pathRelative = mypath
script.echo("Path relative is unchanged: ${pathRelative}")
//script.echo("Path relative is unchanged: ${pathRelative}")
}
// Convert \ with /
pathRelative = pathRelative.tokenize('\\').join('/')
// Strip leading / if any
pathRelative = pathRelative.replaceAll('^/+', '')
script.echo("Path relative is ${pathRelative}")
//script.echo("Path relative is ${pathRelative}")
return pathRelative
}
@ -845,7 +845,7 @@ class MetaInfo extends GISJsonSerialised {
def String adjustedpath = relativize(destpath)
def importedmetafile = adjustedpath + "/" + metafilepath()
if (script.fileExists(importedmetafile)) {
script.echo("Deserialising meta at file: ${importedmetafile} (destpath: ${destpath})")
//script.echo("Deserialising meta at file: ${importedmetafile} (destpath: ${destpath})")
mi.deserialiseJson(importedmetafile)
RelatedMetaInfo rmi = new RelatedMetaInfo_v0_2(script, importedmetafile, adjustedpath, mi.productinfo.uniqueid)
@ -1103,7 +1103,7 @@ class MetaInfo extends GISJsonSerialised {
def ArrayList<CollectedMeta> metacollection = new ArrayList<CollectedMeta>()
def Map<String, CollectedMeta> metamap = new LinkedHashMap<String, CollectedMeta>()
def IterationInfo ii = new IterationInfo(metacollection, metamap, 'meta', 0, startpath, startmetapath, true, maxdepth)
script.echo("Release walker iteration info at start:\n${ii.show()}")
//script.echo("Release walker iteration info at start:\n${ii.show()}")
def results = walkrelated(ii)
return results.metacollection
}

View file

@ -28,7 +28,6 @@ class ProductDependency {
def setreleasestate() {
def LinkedHashMap results = rtscript.startswithspecialprefix(presplitreleasetag)
script.echo("results is: ${results.dump()}")
if (results.hasspecialprefix) {
releasetag = results.tagwithoutprefix
releasestate = results.prefixfound
@ -94,6 +93,10 @@ class ProductParsed {
scanstate = State.PARSED
}
def markparseerror() {
scanstate = State.PARSED
}
def boolean parsed() {
return (scanstate == State.PARSED)
}
@ -103,20 +106,43 @@ class ProductParsed {
}
}
def addProductEntry(LinkedHashMap<String, ProductParsed> products,
def String translateproductvariant(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,
productvarianttranslation,
String productvariant,
String releaserepo) {
def productparsed
if (products.get(releaserepo) == null) { // Use the first entry name only
productparsed = new ProductParsed(productvariant)
products.put(releaserepo, productparsed)
def ProductParsed productparsed
if (productvariant && releaserepo) {
if (productcollection.get(releaserepo) == null) { // Use the first entry name only
echo "Adding product entry: releaserepo: ${releaserepo} (product variant: ${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})"
}
productparsed = productcollection.get(releaserepo)
} else {
productparsed = products.get(releaserepo)
echo "Not adding product entry: releaserepo: ${releaserepo} (product variant: ${productvariant})"
}
return productparsed
}
def parseproductdependencies(LinkedHashMap<String, ProductParsed> products,
def parseproductdependencies(LinkedHashMap<String, ProductParsed> productcollection,
productvarianttranslation,
productreleasemeta,
String productreleasefolder,
String containingproductvariant,
@ -124,88 +150,154 @@ def parseproductdependencies(LinkedHashMap<String, ProductParsed> products,
def dependentmeta = productreleasemeta.getassociated(productreleasefolder)
for (meta in dependentmeta) {
def pd = new ProductDependency(this,
rt,
meta.productvariant(),
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
pd.setreleasestate()
if (meta.productinfo.subcomponentname == 'WHOLE') {
if (meta.productvariant() != containingproductvariant) { // Don't add myself
addProductEntry(products,
meta.productvariant(),
def translatedproductvariant = translateproductvariant(productvarianttranslation,
meta.releaseinfo.releaserepoURL,
meta.productvariant())
if (translatedproductvariant && meta.productinfo.subcomponentname) {
def pd = new ProductDependency(this,
rt,
translatedproductvariant,
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
pd.setreleasestate()
if (meta.productinfo.subcomponentname == 'WHOLE' && translatedproductvariant) {
if (translatedproductvariant != containingproductvariant) { // Don't add myself
addProductEntry(productcollection,
productvarianttranslation,
translatedproductvariant,
meta.releaseinfo.releaserepoURL)
productrelease.addProductDependency(pd)
}
} else if (translatedproductvariant != containingproductvariant && translatedproductvariant) {
addProductEntry(productcollection,
productvarianttranslation,
translatedproductvariant,
meta.releaseinfo.releaserepoURL)
productrelease.addProductDependency(pd)
} else {
def pc = new ProductComponent(meta.productinfo.subcomponentname,
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductComponent(pc)
}
} else if (meta.productvariant() != containingproductvariant) {
addProductEntry(products,
meta.productvariant(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductDependency(pd)
} else {
def pc = new ProductComponent(meta.productinfo.subcomponentname,
meta.releasetag(),
meta.releaseinfo.releaserepoURL)
productrelease.addProductComponent(pc)
echo "Ignoring unnamed dependency in ${productreleasemeta.productvariant()}"
}
}
}
def parseproductrepo(LinkedHashMap<String, ProductParsed> products,
def parseproductrepo(LinkedHashMap<String, ProductParsed> productcollection,
productvarianttranslation,
String productrepo,
String productreleasefolder) {
def LinkedHashMap<String, ArrayList<String>> shatagmap = gh.getremoteshatagmap(productrepo)
def String productvariant
def ProductParsed pp
def boolean productrepogood = true
echo "Querying repo: ${productrepo}"
dir(productreleasefolder) {
deleteDir()
def returnstatus = sh(script: """#!/bin/bash
git init
if [ \$? -ne 0 ]; then exit 1; fi
git config remote.origin.url ${productrepo}
if [ \$? -ne 0 ]; then exit 1; fi
git config advice.detachedHead false
if [ \$? -ne 0 ]; then exit 1; fi
git sparse-checkout init
if [ \$? -ne 0 ]; then exit 1; fi
git sparse-checkout set meta/*
if [ \$? -ne 0 ]; then exit 1; fi
git pull -t
if [ \$? -ne 0 ]; then exit 1; fi
""",
returnStatus: true)
if (returnstatus > 0) {
dir('meta') {
deleteDir()
}
echo "Couldn't clone repository: ${productrepo} correctly"
productrepogood = false
}
}
if (productrepogood) {
def LinkedHashMap<String, ArrayList<String>> shatagmap = gh.getremoteshatagmap(productrepo)
def String productvariant
def ProductParsed pp
shatagmap.each { sha, tags ->
//echo "Sha: ${sha} has tags: ${tags}"
dir(productreleasefolder) {
def returnstatus = sh(script: """#!/bin/bash
git checkout ${sha}
""",
returnStatus: true)
if (returnstatus > 0) {
dir('meta') {
deleteDir()
}
}
}
def productreleasemeta = meta.importrelated(false, productreleasefolder)
if (!productvariant) {
productvariant = productreleasemeta.productvariant()
pp = addProductEntry(productcollection,
productvarianttranslation,
productvariant,
productrepo)
if (pp) {
echo "Product variant created for: ${productrepo} name: ${pp.productvariant}"
} else {
echo "No product entry added/associated with ${productrepo} name: ${productvariant}"
}
}
def ArrayList<ProductRelease> productreleases = new ArrayList<ProductRelease>()
shatagmap.each { sha, tags ->
def importoptions = importer.getNewImportOptions()
importoptions.releaserepo(productrepo, sha)
importoptions.setfilter('meta/**')
def productreleasemeta = importer.artifactimport(meta,
importoptions,
productreleasefolder)
if (!productvariant) {
productvariant = productreleasemeta.productvariant()
pp = addProductEntry(products,
productvariant, productrepo)
if (pp) {
def productrelease = new ProductRelease(sha,
productreleasemeta.jenkinsbuildinfo.builddate,
tags)
echo "Productrelease: ${productrelease.sha} created"
parseproductdependencies(productcollection,
productvarianttranslation,
productreleasemeta,
productreleasefolder,
pp.productvariant,
productrelease)
echo "Productrelease: ${productrelease.sha} added to Productvariant: ${pp.productvariant}"
pp.addProductRelease(productrelease)
}
}
if (pp) {
pp.markparsed()
echo "Productvariant: ${pp.productvariant} parsed"
}
def productrelease = new ProductRelease(sha,
productreleasemeta.jenkinsbuildinfo.builddate,
tags)
parseproductdependencies(products,
productreleasemeta,
productreleasefolder,
productvariant,
productrelease)
pp.addProductRelease(productrelease)
}
pp.markparsed()
}
def iterateinitialproductrepos(initialproductcollection,
productvarianttranslation,
LinkedHashMap<String, ProductParsed> productcollection,
String productreleasefolder) {
for (productrepo in initialproductcollection.ProductReleaseRepos) {
echo "Querying ${productrepo}"
parseproductrepo(productcollection,
productvarianttranslation,
productrepo,
productreleasefolder)
}
while( true ) {
boolean allparsed = true
echo "Parsing extra products"
productcollection.each { releaserepo, productparsed ->
if (!productparsed.parsed()) {
allparsed = false
parseproductrepo(productcollection,
productvarianttranslation,
releaserepo,
productreleasefolder)
} else {
echo "Parsed already ${productparsed.productvariant}"
}
}
if (allparsed) break
if (allparsed) {
echo "All parsed"
break
}
}
}
@ -213,5 +305,4 @@ def LinkedHashMap<String, ProductParsed> getNewProductCollection() {
return new LinkedHashMap<String, ProductParsed>()
}
return this

View file

@ -22,7 +22,7 @@ def resetfolders() {
}
def productuniquefolder(releasemeta) {
return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}"
return "${releasemeta.productvariant()}_${releasemeta.productinfo.subcomponentname}"
}
def uniquereleasefolder(String productline, String softwarerelease, releasemeta) {
@ -116,7 +116,7 @@ def recallcomponent(String productline, releaseinfo, String softwarerelease, ite
def releasemeta = releaseinfo.metainfo
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(productline, releaserepofolder, softwarerelease, releasemeta)
summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ")
summaryappend("${releasemeta.productvariant()} ${releasemeta.productinfo.subcomponentname}: ")
getcomponentartifacts(releaseinfo, uniquefolderforrepo, itempathstopublish)
@ -145,7 +145,7 @@ def publishhierarchy(hostedftpsiteinfo, releasemeta, String releasemetapath, Str
resetfolders()
preconditions()
def productline = releasemeta.productinfo.productname
def productline = releasemeta.productvariant()
// Walk the meta information to a max depth, looking for artifacts to publish
def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md, '', releasemetapath)

View file

@ -191,7 +191,7 @@ def ArrayList<String> maketaglist(buildmeta, String buildstamp, String otherrele
def ArrayList<String> othertaglist = otherreleasetags.split(',')
for (othertagitem in othertaglist) {
if (othertagitem?.trim()) {
def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}"
def componentothertagitem = "${othertagitem.trim()}_${buildmeta.productvariant()}_${buildmeta.productinfo.subcomponentname}"
taglist.add(componentothertagitem)
}
}
@ -377,13 +377,13 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) {
def buildmeta = buildinfo.metainfo
def uriconverted = gh.uniquereporootname(buildmeta.gitinfo.remoteurl)
def String uniquefolder = "${buildmeta.productinfo.productname}_${buildmeta.productinfo.subcomponentname}_${uriconverted}"
def String uniquefolder = "${buildmeta.productvariant()}_${buildmeta.productinfo.subcomponentname}_${uriconverted}"
def String uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ")
repoandtagsappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ")
summaryappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ")
repoandtagsappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ")
def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo)
checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)

View file

@ -43,7 +43,6 @@ LinkedHashMap<String, ArrayList<String>> getremoteshatagmap(String repositoryURL
def shatagfields = shatag.split('\\t')
def sha = shatagfields[0].trim()
def tag = shatagfields[1].trim()
echo "sha: ${sha} tag: ${tag}"
if (shatagmap.get(sha) == null) {
def ArrayList<String> taglist = new ArrayList<String>()
taglist.add(tag)
@ -54,6 +53,9 @@ LinkedHashMap<String, ArrayList<String>> getremoteshatagmap(String repositoryURL
shatagmap.put(sha, taglist)
}
}
shatagmap.each { sha, tags ->
echo "sha: ${sha} has tags: ${tags}"
}
return shatagmap
}