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:18:51 +00:00
commit 63be27007d
2 changed files with 100 additions and 94 deletions

View file

@ -1,98 +1,6 @@
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.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)
}
}
io = load("${autobuilder.commonscripts()}/import/options.groovy")
def artifactimportfrombuildjob(meta, ImportOptions importoptions, String destpath) {
if (importoptions.m_source != 'Jenkins job artifact') {
@ -256,7 +164,7 @@ def artifactimport(meta,
}
ImportOptions getNewImportOptions() {
return new ImportOptions(this)
return io.getNewImportOptions()
}
return this;

98
import/options.groovy Normal file
View file

@ -0,0 +1,98 @@
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;