From aaa96f26d9d685c61e5a9f598e274ddac9e10e5b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 22 Dec 2019 22:56:33 +0000 Subject: [PATCH] GIS-1621 - Try to stop jenkins crash - Move importer options class back into importer --- import/importer.groovy | 102 +++++++++++++++++++++++++++++++++++++++-- import/options.groovy | 98 --------------------------------------- 2 files changed, 97 insertions(+), 103 deletions(-) delete mode 100644 import/options.groovy diff --git a/import/importer.groovy b/import/importer.groovy index ef15c91..784e1f5 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -1,6 +1,102 @@ gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") -io = load("${autobuilder.commonscripts()}/import/options.groovy") + +class ImportOptions { + def m_script // Script to use if wanting to execute script commands (eg. echo -> script.echo) + + boolean m_incrementversionnumber // If true, increment the parent's (4th) version number with the (4th) version number of this object being imported + String m_filter // Only import files/paths/folders that match the filter + String m_excludes // Exclude files/paths/folders that match the exclude filter + boolean m_fingerprint // Do Jenkins fingerprinting on imported artifacts + boolean m_nested // Import all child artifacts too (identified in the related meta info + boolean m_appendtoparentmeta // Append to parent meta + String m_source // Where are the artifacts coming from + + String m_jobname + def m_buildnumberorselector + + String m_repo + String m_revision + + ImportOptions(script, + String source = 'Jenkins job artifact', + boolean incrementversionnumber = true, + String filter = '', + String excludes = '', + boolean fingerprint = false, + boolean nested = false, + appendtoparentmeta = true) { + m_script = script + m_source = source.trim() + m_incrementversionnumber = incrementversionnumber + m_filter = filter.trim() + m_excludes = excludes.trim() + m_fingerprint = fingerprint + m_nested = nested + m_appendtoparentmeta = appendtoparentmeta + } + + void setsource(String source) { + source = source.trim() + switch (source) { + case 'Jenkins job artefact': + m_source = 'Jenkins job artifact' + break + case 'Jenkins job artifact': + case 'Release repository': + m_source = source + break + default: + error("Unknown type of artifact source: ${source}") + } + } + + void setincrementversionnumber(boolean incrementversionnumber) { + m_incrementversionnumber = incrementversionnumber + } + + void setfilter(String filter) { + m_filter = filter.trim() + } + + void setexcludes(String excludes) { + m_excludes = excludes.trim() + } + + void setfingerprint(boolean fingerprint) { + m_fingerprint = fingerprint + } + + void setnested(boolean nested) { + m_nested = nested + } + + void setappendtoparentmeta(boolean appendtoparentmeta) { + m_appendtoparentmeta = appendtoparentmeta + } + + void jenkinsjob(String jobname, String buildnumberorselector) { + m_jobname = jobname.trim() + m_buildnumberorselector = buildnumberorselector.trim() + setsource('Jenkins job artifact') + } + + void releaserepo(String repo, String revision) { + m_repo = repo.trim() + m_revision = revision.trim() + setsource('Release repository') + } + + void source(String source, String jobname, String buildnumberorselector, String repo, String revision) { + jenkinsjob(jobname, buildnumberorselector) + releaserepo(repo, revision) + setsource(source) + } +} + +ImportOptions getNewImportOptions() { + return new ImportOptions(this) +} def artifactimportfrombuildjob(meta, importoptions, String destpath) { if (importoptions.m_source != 'Jenkins job artifact') { @@ -163,8 +259,4 @@ def artifactimport(meta, return artifactimport(meta, importoptions, destpath) } -def getNewImportOptions() { - return io.getNewImportOptions() -} - return this; diff --git a/import/options.groovy b/import/options.groovy deleted file mode 100644 index 8a478ec..0000000 --- a/import/options.groovy +++ /dev/null @@ -1,98 +0,0 @@ -class ImportOptions { - def m_script // Script to use if wanting to execute script commands (eg. echo -> script.echo) - - boolean m_incrementversionnumber // If true, increment the parent's (4th) version number with the (4th) version number of this object being imported - String m_filter // Only import files/paths/folders that match the filter - String m_excludes // Exclude files/paths/folders that match the exclude filter - boolean m_fingerprint // Do Jenkins fingerprinting on imported artifacts - boolean m_nested // Import all child artifacts too (identified in the related meta info - boolean m_appendtoparentmeta // Append to parent meta - String m_source // Where are the artifacts coming from - - String m_jobname - def m_buildnumberorselector - - String m_repo - String m_revision - - ImportOptions(script, - String source = 'Jenkins job artifact', - boolean incrementversionnumber = true, - String filter = '', - String excludes = '', - boolean fingerprint = false, - boolean nested = false, - appendtoparentmeta = true) { - m_script = script - m_source = source.trim() - m_incrementversionnumber = incrementversionnumber - m_filter = filter.trim() - m_excludes = excludes.trim() - m_fingerprint = fingerprint - m_nested = nested - m_appendtoparentmeta = appendtoparentmeta - } - - void setsource(String source) { - source = source.trim() - switch (source) { - case 'Jenkins job artefact': - m_source = 'Jenkins job artifact' - break - case 'Jenkins job artifact': - case 'Release repository': - m_source = source - break - default: - error("Unknown type of artifact source: ${source}") - } - } - - void setincrementversionnumber(boolean incrementversionnumber) { - m_incrementversionnumber = incrementversionnumber - } - - void setfilter(String filter) { - m_filter = filter.trim() - } - - void setexcludes(String excludes) { - m_excludes = excludes.trim() - } - - void setfingerprint(boolean fingerprint) { - m_fingerprint = fingerprint - } - - void setnested(boolean nested) { - m_nested = nested - } - - void setappendtoparentmeta(boolean appendtoparentmeta) { - m_appendtoparentmeta = appendtoparentmeta - } - - void jenkinsjob(String jobname, String buildnumberorselector) { - m_jobname = jobname.trim() - m_buildnumberorselector = buildnumberorselector.trim() - setsource('Jenkins job artifact') - } - - void releaserepo(String repo, String revision) { - m_repo = repo.trim() - m_revision = revision.trim() - setsource('Release repository') - } - - void source(String source, String jobname, String buildnumberorselector, String repo, String revision) { - jenkinsjob(jobname, buildnumberorselector) - releaserepo(repo, revision) - setsource(source) - } -} - -ImportOptions getNewImportOptions() { - return new ImportOptions(this) -} - -return this; \ No newline at end of file