CORE-594 - Debug installer creation

This commit is contained in:
Dan Hawkins 2022-01-13 14:21:53 +00:00
commit d70f63344e
2 changed files with 9 additions and 4 deletions

View file

@ -34,7 +34,7 @@ class ImportOptions {
boolean includemetainfilter = true,
boolean clean = true,
appendtoparentmeta = true,
show = false) {
showdetails = false) {
m_script = script
m_sourceselect = sourceselect.trim()
m_incrementversionnumber = incrementversionnumber
@ -46,7 +46,7 @@ class ImportOptions {
m_includemetainfilter = includemetainfilter
m_clean = clean
m_appendtoparentmeta = appendtoparentmeta
m_showdetails = show
m_showdetails = showdetails
}
String show() {
@ -147,6 +147,10 @@ class ImportOptions {
releaserepo(repo, revision)
setsourceselect(sourceselect)
}
void showdetails(boolean showdetails) {
m_showdetails = showdetails
}
}
ImportOptions getNewImportOptions() {
@ -285,7 +289,7 @@ def artifactimportfromrepo(meta, ImportOptions importoptions, String destpath) {
}
def artifactimport(meta, ImportOptions importoptions, String destpath) {
if (importoptions.m_show) {
if (importoptions.m_showdetails) {
echo "Importing artifacts:\nImport options:\n${importoptions.show()}\nto: ${destpath}"
}
switch (importoptions.m_sourceselect) {

View file

@ -23,11 +23,12 @@ def copyToFinalPosition(String pathToIntermediate, String finalBaseFolder, Strin
}
// Given details about artifacts to import and details of installers to build, import artifacts that are required
def Map artifactsImporter(meta, importer, artifactDetails, installerDetails) {
def Map artifactsImporter(meta, importer, artifactDetails, installerDetails, boolean showdetails = false) {
artifactFetched = [:]
echo ("artifactDetails:\n${artifactDetails}\ninstallerDetails:\n${installerDetails}")
def importoptions = importer.getNewImportOptions()
importoptions.showdetails(showdetails)
for (installer in toBuild) {
def artifactKeys = installerDetails.get(installer)[1]
if (artifactKeys instanceof java.lang.String) {