develop #15

Merged
iparenteau merged 7 commits from develop into master 2022-09-18 22:50:58 -05:00
5 changed files with 18 additions and 18 deletions
Showing only changes of commit 8b4e67892a - Show all commits

8
Jenkinsfile vendored
View File

@ -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')
} }