diff --git a/install/install.groovy b/install/install.groovy index 4683371..2040470 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -129,12 +129,36 @@ pipeline { } steps { script { - version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCE_REVISION, SOURCE_PATH) + importer = load("${autobuilder.commonscripts()}/import/importer.groovy") + + def importoptions = importer.getNewImportOptions() + importoptions.jenkinsjob(ATLAS_CUSTOM_MODULES_COMPILE_JOB, ATLAS_CUSTOM_MODULES_COMPILE_JOB_SELECTOR) + importoptions.setincrementversionnumber(false) + def compilemeta = importer.artifactimport(meta, importoptions, "${IMPORTSPATH}\\build\\moduleset" ) + def relatedcomponents = compilemeta.metareleasewalkerversionunique(1) + relatedcomponents.each { + relatedcomponent -> echo "relatedcomponent string: ${relatedcomponent.key}" + } } } } - stage("Import binaries") { + stage('Import binaries 1') { + when { + expression { + toBuild + } + } + steps { + script { + version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") + version.generate(meta, SOURCE_REVISION, SOURCE_PATH) + + metareleasewalkerversionunique(int maxdepth, String startpath = "") { + + } + } + } + stage("Import binaries 2") { when { expression { toBuild @@ -160,7 +184,6 @@ pipeline { LOG_VIEWER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_log_viewer.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Log Viewer/DiskImages/DISK1/GIS Atlas UI Custom Module - Log Viewer.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Log Viewer", "GIS Atlas UI Custom Module - Log Viewer ${BUILD_STAMP}.exe" ], COMPONENT_MONITOR: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_component_monitor.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Component Monitor/DiskImages/DISK1/GIS Atlas UI Custom Module - Component Monitor.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Component Monitor", "GIS Atlas UI Custom Module - Component Monitor ${BUILD_STAMP}.exe" ], ] - importer = load("${autobuilder.commonscripts()}/import/importer.groovy") installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy") artifactFetched = installerhelper.artifactsImporter(meta, importer, artifactDetails, installerDetails) }