Use productvariant() instead of .productinfo.productname

This commit is contained in:
Dan Hawkins 2022-03-13 22:19:51 +00:00
commit 2ae44ffdcd
4 changed files with 18 additions and 18 deletions

View file

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

View file

@ -30,10 +30,10 @@ pipeline {
importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**') importoptions.setfilter(ARTIFACT_PATH_TO_DOXYGEN_ROOT + '/**')
doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN) doxygenmeta = importer.artifactimportfrombuildjob(meta, importoptions, DOXYGEN)
productname = doxygenmeta.productinfo.productname productvariant = doxygenmeta.productvariant()
buildstampprefix = doxygenmeta.buildstampinfo.buildstampprefix 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 { steps {
script { script {
doxygensource = "${DOXYGEN}/${ARTIFACT_PATH_TO_DOXYGEN_ROOT}" 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}" echo "Copying from ${doxygensource} to ${pathonserver}"
if (isUnix()) { if (isUnix()) {
sh """#!/bin/bash sh """#!/bin/bash

View file

@ -22,7 +22,7 @@ def resetfolders() {
} }
def productuniquefolder(releasemeta) { def productuniquefolder(releasemeta) {
return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}" return "${releasemeta.productvariant()}_${releasemeta.productinfo.subcomponentname}"
} }
def uniquereleasefolder(String productline, String softwarerelease, releasemeta) { def uniquereleasefolder(String productline, String softwarerelease, releasemeta) {
@ -116,7 +116,7 @@ def recallcomponent(String productline, releaseinfo, String softwarerelease, ite
def releasemeta = releaseinfo.metainfo def releasemeta = releaseinfo.metainfo
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(productline, releaserepofolder, softwarerelease, releasemeta) 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) getcomponentartifacts(releaseinfo, uniquefolderforrepo, itempathstopublish)
@ -145,7 +145,7 @@ def publishhierarchy(hostedftpsiteinfo, releasemeta, String releasemetapath, Str
resetfolders() resetfolders()
preconditions() preconditions()
def productline = releasemeta.productinfo.productname def productline = releasemeta.productvariant()
// Walk the meta information to a max depth, looking for artifacts to publish // Walk the meta information to a max depth, looking for artifacts to publish
def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md, '', releasemetapath) 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(',') def ArrayList<String> othertaglist = otherreleasetags.split(',')
for (othertagitem in othertaglist) { for (othertagitem in othertaglist) {
if (othertagitem?.trim()) { 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) taglist.add(componentothertagitem)
} }
} }
@ -377,13 +377,13 @@ def gitrelease(buildmeta, previousreleasemeta, String releaserepo, String source
def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) { def releasecomponent(toplevelbuildmeta, buildinfo, String otherreleasetags, String dryrunpush) {
def buildmeta = buildinfo.metainfo def buildmeta = buildinfo.metainfo
def uriconverted = gh.uniquereporootname(buildmeta.gitinfo.remoteurl) 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 uniquefolderforrepo = "${releaserepofolder}/${uniquefolder}"
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}" def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}" def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
summaryappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") summaryappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ")
repoandtagsappend("${buildmeta.productinfo.productname} ${buildmeta.productinfo.subcomponentname}: ") repoandtagsappend("${buildmeta.productvariant()} ${buildmeta.productinfo.subcomponentname}: ")
def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo) def previousreleasemeta = checkoutreleaserepo(buildmeta, uniquefolderforrepo)
checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo) checkoutsourcerepo(buildmeta, uniquefolderforsourcerepo)