CORE-594 - Debug installer creation

This commit is contained in:
Dan Hawkins 2022-01-13 14:16:27 +00:00
commit fda3e8890a
3 changed files with 9 additions and 7 deletions

View file

@ -20,6 +20,8 @@ class ImportOptions {
String m_repo
String m_revision
boolean m_showdetails
ImportOptions(script,
String sourceselect = 'Jenkins job artifact',
@ -31,7 +33,8 @@ class ImportOptions {
boolean flatten = false,
boolean includemetainfilter = true,
boolean clean = true,
appendtoparentmeta = true) {
appendtoparentmeta = true,
show = false) {
m_script = script
m_sourceselect = sourceselect.trim()
m_incrementversionnumber = incrementversionnumber
@ -43,6 +46,7 @@ class ImportOptions {
m_includemetainfilter = includemetainfilter
m_clean = clean
m_appendtoparentmeta = appendtoparentmeta
m_showdetails = show
}
String show() {
@ -281,7 +285,9 @@ def artifactimportfromrepo(meta, ImportOptions importoptions, String destpath) {
}
def artifactimport(meta, ImportOptions importoptions, String destpath) {
echo "Importing artifacts: Import options:\n${importoptions.show()}\n to: ${destpath}"
if (importoptions.m_show) {
echo "Importing artifacts:\nImport options:\n${importoptions.show()}\nto: ${destpath}"
}
switch (importoptions.m_sourceselect) {
case 'Jenkins job artifact':
case 'Jenkins job artefact':

View file

@ -26,6 +26,7 @@ def copyToFinalPosition(String pathToIntermediate, String finalBaseFolder, Strin
def Map artifactsImporter(meta, importer, artifactDetails, installerDetails) {
artifactFetched = [:]
echo ("artifactDetails:\n${artifactDetails}\ninstallerDetails:\n${installerDetails}")
def importoptions = importer.getNewImportOptions()
for (installer in toBuild) {
def artifactKeys = installerDetails.get(installer)[1]

View file

@ -173,9 +173,6 @@ pipeline {
script {
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'],
lnpubuildjobartifactinfo['Job'],
@ -184,7 +181,6 @@ pipeline {
lnpubuildjobartifactinfo['Release repo revision'])
lnpubuildimportoptions.setincrementversionnumber(false)
lnpubuildmeta = importer.artifactimport(meta, lnpubuildimportoptions, LNPUBUILDIMPORT)
echo ("I am here 2")
def BUILD_STAMP=meta.buildstampinfo.buildstamp
artifactDetails = [
@ -196,7 +192,6 @@ pipeline {
// Key, Installer command artifactSet Target folder Execution path ISM project file Variant Intermediate output path Component base folder Final filename
LNPU: [INSTALLSHIELD2020_CMD, 'AppPackageSet,ControlPackageSet', 'install_core', "${SOURCE_PATH}\\installer\\build\\core", 'Core.ism', 'XR1003', "${INTERMEDIATEEXPORTSPATH}/install_core/x64/XR1003/DiskImages/DISK1/GIS Inkjet OS 2.exe", "${EXPORTSPATH}/XR1003", "GIS Inkjet OS XR1003 ${BUILD_STAMP}.exe" ],
]
echo ("artifactDetails: ${artifactDetails}\ninstallerDetails: ${installerDetails}")
installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy")
artifactFetched = installerhelper.artifactsImporter(meta, importer, artifactDetails, installerDetails)
}