GIS-1621 - Import for version numbering but don't append to meta data

This commit is contained in:
Dan Hawkins 2019-12-20 16:35:26 +00:00
commit ecb225bff7

View file

@ -12,7 +12,7 @@ class ImportOptions {
boolean appendtoparentmeta // Append to parent meta
String source // Where are the artifacts coming from
String jenkinsjob
String jobname
def buildnumberorselector
String repo
@ -83,8 +83,8 @@ class ImportOptions {
}
@NonCPS
void jenkinsjob(String jenkinsjob, String buildnumberorselector) {
this.jenkinsjob = jenkinsjob.trim()
void jenkinsjob(String jobname, String buildnumberorselector) {
this.jobname = jobname.trim()
this.buildnumberorselector = buildnumberorselector.trim()
setsource('Jenkins job artifact')
}
@ -97,8 +97,8 @@ class ImportOptions {
}
@NonCPS
void source(String source, String jenkinsjob, String buildnumberorselector, String repo, String revision) {
jenkinsjob(jenkinsjob, buildnumberorselector)
void source(String source, String jobname, String buildnumberorselector, String repo, String revision) {
jenkinsjob(jobname, buildnumberorselector)
releaserepo(repo, revision)
setsource(source)
}
@ -118,7 +118,7 @@ def artifactimportfrombuildjob(meta, ImportOptions importoptions, String destpat
filter: importoptions.filter,
excludes: importoptions.excludes,
fingerprintArtifacts: fingerprint,
projectName: importoptions.jenkinsjob,
projectName: importoptions.jobname,
selector: [
$class: 'ParameterizedBuildSelector',
parameterName: importoptions.buildselector