diff --git a/Common_scripts/import/importer.groovy b/Common_scripts/import/importer.groovy index 8bc96a3..2f7611e 100644 --- a/Common_scripts/import/importer.groovy +++ b/Common_scripts/import/importer.groovy @@ -45,8 +45,22 @@ class ImportOptions { m_appendtoparentmeta = appendtoparentmeta } - void show() { - m_script.echo(this.toString()) + String show() { + return """m_incrementversionnumber: ${m_incrementversionnumber} + m_filter: ${m_filter} + m_excludes: ${m_excludes} + m_fingerprint: ${m_fingerprint} + m_nested: ${m_nested} + m_flatten: ${m_flatten} + m_includemetainfilter: ${m_includemetainfilter} + m_clean: ${m_clean} + m_appendtoparentmeta: ${m_appendtoparentmeta} + m_sourceselect: ${m_sourceselect} + m_jobname: ${m_jobname} + m_buildnumberorselector: ${m_buildnumberorselector} + m_repo: ${m_repo} + m_revision: ${m_revision} + """ } void setsourceselect(String sourceselect) { @@ -267,7 +281,7 @@ def artifactimportfromrepo(meta, ImportOptions importoptions, String destpath) { } def artifactimport(meta, ImportOptions importoptions, String destpath) { - importoptions.show() + echo "Importing artifacts: Import options:\n${importoptions.show()}\n to: ${destpath}" switch (importoptions.m_sourceselect) { case 'Jenkins job artifact': case 'Jenkins job artefact': diff --git a/install/install.groovy b/install/install.groovy index b3d41e2..1fc6ace 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -174,6 +174,7 @@ pipeline { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") echo ("I am here: ${lnpubuildjobartifactinfo['Location']} ${lnpubuildjobartifactinfo['Job']} ${lnpubuildjobartifactinfo['Job selector']}") + echo ("I am here: ${lnpubuildjobartifactinfo['Release repo']} ${lnpubuildjobartifactinfo['Release repo revision']}") def lnpubuildimportoptions = importer.getNewImportOptions() lnpubuildimportoptions.source(lnpubuildjobartifactinfo['Location'],