From 0d53bf9f5852cf153caaea6d3efbf74873e62a0f Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 21 Dec 2019 20:00:54 +0000 Subject: [PATCH] GIS-1621 - Use new form of importer method --- install/installhelper.groovy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/install/installhelper.groovy b/install/installhelper.groovy index 6fcdc6c..34a33d8 100644 --- a/install/installhelper.groovy +++ b/install/installhelper.groovy @@ -35,7 +35,16 @@ def Map artifactsImporter(meta, artifactDetails, installerDetails) { for (artifactKey in artifactKeys) { (sourceProject, sourceselector, destFolder, incrementversionnumber, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey) if (artifactFetched.get(artifactKey) == null) { - def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, incrementversionnumber, toCopy, notToCopy) + + def importoptions = importer.getNewImportOptions(this) + + importoptions.jenkinsjob(sourceProject, sourceselector) + + importoptions.setincrementversionnumber(incrementversionnumber) + importoptions.setfilter(toCopy) + importoptions.setexcludes(notToCopy) + + def importmeta = importer.artifactimport(meta, importoptions, destFolder) artifactFetched.put(artifactKey, importmeta) } }