Handle different types of build selector parameter
This commit is contained in:
parent
6a8d736299
commit
5ee449e22b
1 changed files with 14 additions and 6 deletions
|
|
@ -96,9 +96,18 @@ class ImportOptions {
|
|||
m_appendtoparentmeta = appendtoparentmeta
|
||||
}
|
||||
|
||||
void jenkinsjob(String jobname, String buildnumberorselector) {
|
||||
void jenkinsjob(String jobname, buildnumberorselector) {
|
||||
m_jobname = jobname.trim()
|
||||
m_buildnumberorselector = buildnumberorselector.trim()
|
||||
m_buildnumberorselector = [
|
||||
$class: 'ParameterizedBuildSelector',
|
||||
parameterName: buildnumberorselector
|
||||
]
|
||||
setsourceselect('Jenkins job artifact')
|
||||
}
|
||||
|
||||
void jenkinsjob(String jobname, int buildnumberorselector) {
|
||||
m_jobname = jobname.trim()
|
||||
m_buildnumberorselector = specific("${buildnumberorselector}")
|
||||
setsourceselect('Jenkins job artifact')
|
||||
}
|
||||
|
||||
|
|
@ -147,15 +156,14 @@ def artifactimportfrombuildjob(meta, importoptions, String destpath) {
|
|||
|
||||
conditionalClean(importoptions, destpath)
|
||||
|
||||
echo "Build selector type: ${importoptions.m_buildnumberorselector.getClass()}"
|
||||
|
||||
copyArtifacts(
|
||||
filter: formFilter(importoptions),
|
||||
excludes: importoptions.m_excludes,
|
||||
fingerprintArtifacts: importoptions.m_fingerprint,
|
||||
projectName: importoptions.m_jobname,
|
||||
selector: [
|
||||
$class: 'ParameterizedBuildSelector',
|
||||
parameterName: importoptions.m_buildnumberorselector
|
||||
],
|
||||
selector: importoptions.m_buildnumberorselector,
|
||||
flatten: importoptions.m_flatten,
|
||||
target: destpath
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue