GIS-1621 - Try to stop jenkins crash - Seperate importoptions class into its own file

This commit is contained in:
Dan Hawkins 2019-12-22 22:31:31 +00:00
commit 5a3483b950

View file

@ -2,7 +2,7 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
io = load("${autobuilder.commonscripts()}/import/options.groovy")
def artifactimportfrombuildjob(meta, ImportOptions importoptions, String destpath) {
def artifactimportfrombuildjob(meta, importoptions, String destpath) {
if (importoptions.m_source != 'Jenkins job artifact') {
error("Import options settings have not been set for: Jenkins job artifact")
return
@ -32,7 +32,7 @@ def rewritemetafileasreleased(meta, String filepath) {
meta.saveJsonSerialised(filepath)
}
def hierarchyartifactimportfromrepo(meta, io.ImportOptions importoptions, String destpath) {
def hierarchyartifactimportfromrepo(meta, importoptions, String destpath) {
if (importoptions.m_source != 'Release repository') {
error("Import options settings have not been set for: Release repository")
return
@ -76,7 +76,7 @@ def hierarchyartifactimportfromrepo(meta, io.ImportOptions importoptions, String
return importedmeta
}
def artifactimportfromrepo(meta, io.ImportOptions importoptions, String destpath) {
def artifactimportfromrepo(meta, importoptions, String destpath) {
if (importoptions.m_source != 'Release repository') {
error("Import options settings have not been set for: Release repository")
return
@ -102,7 +102,7 @@ def artifactimportfromrepo(meta, io.ImportOptions importoptions, String destpath
return importedmeta
}
def artifactimport(meta, io.ImportOptions importoptions, String destpath) {
def artifactimport(meta, importoptions, String destpath) {
switch (importoptions.m_source) {
case 'Jenkins job artifact':
case 'Jenkins job artefact':
@ -163,7 +163,7 @@ def artifactimport(meta,
return artifactimport(meta, importoptions, destpath)
}
ImportOptions getNewImportOptions() {
def getNewImportOptions() {
return io.getNewImportOptions()
}