From 4f193d3ab062a31de0af4a7bef338be5847f0f97 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 13 Jan 2022 16:17:51 +0000 Subject: [PATCH] CORE-594 - Debug installer creation --- install/install.groovy | 149 +++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 95 deletions(-) diff --git a/install/install.groovy b/install/install.groovy index f72c9b2..1568e93 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -45,42 +45,12 @@ pipeline { currentBuild.result = 'FAILED' exit(1) } - installerlist = env.INSTALLERS_TO_BUILD - if (installerlist != null) { - installerlist = installerlist.trim() - } else { - installerlist = '' - } - toBuild = [] - if (installerlist) { - toBuildUntrimmed = installerlist.split(',') - toBuildUntrimmed.each { - toBuild.add(it.trim()) - } - } - } - echo "Installer list: ${installerlist}" - } - } - stage('Nothing to build check') { - when { - expression { - !toBuild - } - } - steps { - echo 'No installers to build' - script { - currentBuild.result = 'UNSTABLE' + + toBuild = ['LNPU'] } } } stage('Checkout dependencies') { - when { - expression { - toBuild - } - } steps { script { configurationhelper = autobuilder.configurationhelper() @@ -151,11 +121,6 @@ pipeline { } } stage('Generating version info') { - when { - expression { - toBuild - } - } steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") @@ -164,11 +129,6 @@ pipeline { } } stage("Import binaries") { - when { - expression { - toBuild - } - } steps { script { def importer = load("${autobuilder.commonscripts()}/import/importer.groovy") @@ -190,7 +150,7 @@ pipeline { ] installerDetails = [ // 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" ], + LNPU: [INSTALLSHIELD2020_CMD, ['AppPackageSet','ControlPackageSet'], 'install_core', "${SOURCE_PATH}\\installer\\build\\core", 'Core.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_core/x64/XR1003/DiskImages/DISK1/GIS Inkjet OS 2.exe", "${EXPORTSPATH}/XR1003", "GIS Inkjet OS XR1003 ${BUILD_STAMP}.exe" ], ] installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy") artifactFetched = installerhelper.artifactsImporter(meta, importer, artifactDetails, installerDetails, true) @@ -213,62 +173,71 @@ pipeline { } } stage("Build installers") { - when { - expression { - toBuild - } - } steps { script { fileOperations([folderCreateOperation(INTERMEDIATEEXPORTSPATH)]) installerpublishlist = [] - for (installer in toBuild) { - (installcmd, artifactKey, processingFolder, EXECUTIONPATH, ISMPROJECT, VARIANT, pathToIntermediate, FINALBASEFOLDER, FINALFILENAME) = installerDetails.get(installer) + (installcmd, artifactKeySet, processingFolder, EXECUTIONPATH, ISMPROJECT, VARIANT, pathToIntermediate, FINALBASEFOLDER, FINALFILENAME) = installerDetails.get(toBuild) - def importmeta = artifactFetched.get('AppPackageSet') - def INST_ISVERSION = importmeta.buildstampinfo.buildstamp - echo "For: ${installer} build stamp is: ${INST_ISVERSION}" + def primaryArtifactKey = 'AppPackageSet' + def appimportmeta = artifactFetched.get(primaryArtifactKey) + def INST_ISVERSION = appimportmeta.buildstampinfo.buildstamp + echo "For: ${installer} build stamp is: ${INST_ISVERSION}" - (sourceProject, sourceselector, destFolder, incrementversionnumber, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) - def INST_BIN = "${destFolder}\\bin" + (apppackagesourceProject, + apppackagesourceselector, + apppackagedestFolder, + apppackageincrementversionnumber, + apppackagetoCopy, + apppackagenotToCopy, + apppackagebinariesFolders) = artifactDetails.get(primaryArtifactKey) - def INST_VERBOSE = '' - if (VERBOSE == "true") { - INST_VERBOSE = '-v' - } + def APP_PACKAGE_BIN = "${apppackagedestFolder}" - def INST_OUT = "${INTERMEDIATEEXPORTSPATH}\\${processingFolder}" - fileOperations([folderCreateOperation(INST_OUT)]) + def controlArtifactKey = 'ControlPackageSet' + (controlpackagesourceProject, + controlpackagesourceselector, + controlpackagedestFolder, + controlpackageincrementversionnumber, + controlpackagetoCopy, + controlpackagenotToCopy, + controlpackagebinariesFolders) = artifactDetails.get(controlArtifactKey) - def INST_VARIANT = '' - if (VARIANT != "" ) { - INST_VARIANT = '-r ' + VARIANT - } - installerhelper.checkISMfile("${EXECUTIONPATH}\\${ISMPROJECT}") - installerhelper.selectSigningCertificate(NODE_NAME, "${EXECUTIONPATH}\\${ISMPROJECT}") - - dir(EXECUTIONPATH) { - // INSTALLSHIELD201X_CMD and DOTNET_FRAMEWORK64_PATH must be externally defined - bat """ - "${installcmd}" -t "${DOTNET_FRAMEWORK64_PATH}" -p "${ISMPROJECT}" -y "${INST_ISVERSION}" -l "WORKSPACE=${WORKSPACE}" -l "INST_USB_PMB_C8_3_1040_1041=${INST_USB_PMB_C8_3_1040_1041}" -l "INST_USB_PMB_C8_3_1030=${INST_USB_PMB_C8_3_1030}" -l "INST_USB_PMB_C8_C2=${INST_USB_PMB_C8_C2}" -l "INST_BIN=${INST_BIN}" -l "INST_CONFIGS=${INST_CONFIGS}" -l "INST_RELEASE_NOTES=${INST_RELEASE_NOTES}" -l "INST_RESOURCEFILES=${INST_RESOURCEFILES}" -l "INST_SRC=${INST_SRC}" -l "INST_OUT=${INST_OUT}" -l "INST_EULA=${INST_EULA}" -l "INST_ICCPROFILES=${INST_ICCPROFILES}" -l "INST_SUPPORT=${INST_SUPPORT}" -l "INST_SEC=${INST_SEC}" -l "INST_VERSIONINFO=${VERSIONINFO}" -prqpath "${INST_PREQ}" ${INST_VERBOSE} ${INST_VARIANT} -a x64 - """ - } - - installerhelper.copyToFinalPosition(pathToIntermediate, FINALBASEFOLDER, FINALFILENAME) - - def EXPORT_OUT_GLOB = "${FINALBASEFOLDER}/**" - echo "Adding ${EXPORT_OUT_GLOB} to installer publish list" - installerpublishlist.add(EXPORT_OUT_GLOB) + def CONTROL_PACKAGE_BIN = "${controlpackagedestFolder}" + + def LNPU_BIN = LNPUBUILDIMPORT + + def INST_VERBOSE = '' + if (VERBOSE == "true") { + INST_VERBOSE = '-v' } + + def INST_OUT = "${INTERMEDIATEEXPORTSPATH}\\${processingFolder}" + fileOperations([folderCreateOperation(INST_OUT)]) + + def INST_VARIANT = '' + if (VARIANT != "" ) { + INST_VARIANT = '-r ' + VARIANT + } + installerhelper.checkISMfile("${EXECUTIONPATH}\\${ISMPROJECT}") + installerhelper.selectSigningCertificate(NODE_NAME, "${EXECUTIONPATH}\\${ISMPROJECT}") + + dir(EXECUTIONPATH) { + // INSTALLSHIELD201X_CMD and DOTNET_FRAMEWORK64_PATH must be externally defined + bat """ + "${installcmd}" -t "${DOTNET_FRAMEWORK64_PATH}" -p "${ISMPROJECT}" -y "${INST_ISVERSION}" -l "WORKSPACE=${WORKSPACE}" -l "APP_PACKAGE_BIN=${APP_PACKAGE_BIN}" -l "CONTROL_PACKAGE_BIN=${CONTROL_PACKAGE_BIN}" -l "LNPU_BIN=${LNPU_BIN}" -l "INST_OUT=${INST_OUT}" -l "INST_EULA=${INST_EULA}" -l "INST_SUPPORT=${INST_SUPPORT}" -l "INST_VERSIONINFO=${VERSIONINFO}" -prqpath "${INST_PREQ}" ${INST_VERBOSE} ${INST_VARIANT} -a x64 + """ + } + + installerhelper.copyToFinalPosition(pathToIntermediate, FINALBASEFOLDER, FINALFILENAME) + + def EXPORT_OUT_GLOB = "${FINALBASEFOLDER}/**" + echo "Adding ${EXPORT_OUT_GLOB} to installer publish list" + installerpublishlist.add(EXPORT_OUT_GLOB) } } } stage('Classifying publishable artifacts') { - when { - expression { - toBuild - } - } steps { script { def publishable = installerpublishlist @@ -278,11 +247,6 @@ pipeline { } } stage('Archiving artifacts') { - when { - expression { - toBuild - } - } steps { script { ArrayList itemsForRelease = ["info/**", "installers/**"] @@ -293,11 +257,6 @@ pipeline { } } stage('Check for unstable build') { - when { - expression { - toBuild - } - } steps { script { def installersToBuild = installerDetails.size()