make sure we don't pass origin/ with branch name to child jobs
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
3a3a6f2aa5
commit
0bbfe24aec
|
@ -3,12 +3,14 @@ def version() {
|
||||||
}
|
}
|
||||||
|
|
||||||
def buildBranch(name = null, buildType = params.BUILD_TYPE) {
|
def buildBranch(name = null, buildType = params.BUILD_TYPE) {
|
||||||
|
/* need to drop origin/ to match definitions of child jobs */
|
||||||
|
def branchName = env.GIT_BRANCH.replace('origin/', '')
|
||||||
/* always pass the BRANCH and BUILD_TYPE params with current branch */
|
/* always pass the BRANCH and BUILD_TYPE params with current branch */
|
||||||
return build(
|
return build(
|
||||||
job: name,
|
job: name,
|
||||||
parameters: [
|
parameters: [
|
||||||
[name: 'BRANCH', value: env.GIT_BRANCH, $class: 'StringParameterValue'],
|
[name: 'BRANCH', value: branchName, $class: 'StringParameterValue'],
|
||||||
[name: 'BUILD_TYPE', value: buildType, $class: 'StringParameterValue'],
|
[name: 'BUILD_TYPE', value: buildType, $class: 'StringParameterValue'],
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue