From ecb225bff71552e2ac210a22a952b21f486837fa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 20 Dec 2019 16:35:26 +0000 Subject: [PATCH] GIS-1621 - Import for version numbering but don't append to meta data --- import/importer.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/import/importer.groovy b/import/importer.groovy index 75c4412..2ceb9f0 100644 --- a/import/importer.groovy +++ b/import/importer.groovy @@ -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