Author SHA1 Message Date
iparenteau 65cc93f466 Merge pull request 'master' (#13) from master into release/1.1
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #13
2022-03-02 17:32:06 -06:00
iparenteau a4c39918f0 Merge branch 'develop' into master
Locusworks Team/app-logger/pipeline/head This commit looks good
2022-03-02 17:30:25 -06:00
iparenteau 55a2f620a1 Merge pull request 'Adjusted node' (#11) from bug/jenkins_update into develop
Locusworks Team/app-logger/pipeline/head This commit looks good
Reviewed-on: #11
2022-03-02 17:24:09 -06:00
Isaac Parenteau b50eccc471 Adjusted node 2022-03-02 18:16:32 -05:00
iparenteau ecfdf202d8 Merge pull request 'bug/jenkins_update' (#10) from bug/jenkins_update into develop
Locusworks Team/app-logger/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #10
2022-03-02 17:15:36 -06:00
Isaac Parenteau 43cffb3610 Merge branch 'develop' of ssh://gitea.locusworks.net:7999/locusworks/app-logger into bug/jenkins_update 2022-03-02 18:08:10 -05:00
Isaac Parenteau 8575afe735 Updated jenkins build file 2022-03-02 18:07:55 -05:00
Isaac Parenteau 1986831f2c updated log4j library 2022-03-02 17:47:08 -05:00
Isaac Parenteau 9ac40b5922 Updated log4j 2022-03-02 17:41:44 -05:00
Vendored
+4 -4
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')
} }