Merge branch 'develop' into master
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
All checks were successful
Locusworks Team/app-logger/pipeline/head This commit looks good
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'
|
if (branch_name.indexOf('master')==0) build_type='master'
|
||||||
|
|
||||||
// common pipeline elements
|
// common pipeline elements
|
||||||
node('master') {
|
node() {
|
||||||
Initialize()
|
Initialize()
|
||||||
SetVersion(build_type)
|
SetVersion(build_type)
|
||||||
print_vars() // after SetVersion - all variables now defined
|
print_vars() // after SetVersion - all variables now defined
|
||||||
@ -57,16 +57,16 @@ def init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (branch_name.indexOf('develop')==0) {
|
if (branch_name.indexOf('develop')==0) {
|
||||||
node('master') {
|
node() {
|
||||||
Deploy();
|
Deploy();
|
||||||
}
|
}
|
||||||
} else if (branch_name.indexOf('release/')==0) {
|
} else if (branch_name.indexOf('release/')==0) {
|
||||||
node('master') {
|
node() {
|
||||||
Deploy();
|
Deploy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
node('master') {
|
node() {
|
||||||
set_result('SUCCESS')
|
set_result('SUCCESS')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user