Merge pull request 'bug/jenkins_update' (#10) from bug/jenkins_update into develop
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Some checks reported errors
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #10
This commit is contained in:
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
@ -48,7 +48,7 @@ def init() {
|
||||
if (branch_name.indexOf('master')==0) build_type='master'
|
||||
|
||||
// common pipeline elements
|
||||
node('master') {
|
||||
node('controller') {
|
||||
Initialize()
|
||||
SetVersion(build_type)
|
||||
print_vars() // after SetVersion - all variables now defined
|
||||
@ -57,16 +57,16 @@ def init() {
|
||||
}
|
||||
|
||||
if (branch_name.indexOf('develop')==0) {
|
||||
node('master') {
|
||||
node('controller') {
|
||||
Deploy();
|
||||
}
|
||||
} else if (branch_name.indexOf('release/')==0) {
|
||||
node('master') {
|
||||
node('controller') {
|
||||
Deploy();
|
||||
}
|
||||
}
|
||||
|
||||
node('master') {
|
||||
node('controller') {
|
||||
set_result('SUCCESS')
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user