diff options
| -rw-r--r-- | jjb/yaml/openbook-all-pipeline.yaml | 10 | ||||
| -rw-r--r-- | jjb/yaml/openbook-core-pipeline.yaml | 6 | ||||
| -rw-r--r-- | jjb/yaml/openbook-pipeline.yaml | 28 |
3 files changed, 18 insertions, 26 deletions
diff --git a/jjb/yaml/openbook-all-pipeline.yaml b/jjb/yaml/openbook-all-pipeline.yaml index efcb2ef..5977181 100644 --- a/jjb/yaml/openbook-all-pipeline.yaml +++ b/jjb/yaml/openbook-all-pipeline.yaml @@ -18,7 +18,7 @@ } } steps { - checkout([ + checkout( scm: [ $class: "GitSCM", branches: [ @@ -28,12 +28,10 @@ [url: "git@github.com:Talligent/openbook-core.git"] ], extensions: [ - $class: "DisableRemotePoll" - ], - poll: false, - changelog: false + [$class: "DisableRemotePoll"] + ] ] - ]) + ) } } stage("database") { diff --git a/jjb/yaml/openbook-core-pipeline.yaml b/jjb/yaml/openbook-core-pipeline.yaml index dd98c84..8498ddf 100644 --- a/jjb/yaml/openbook-core-pipeline.yaml +++ b/jjb/yaml/openbook-core-pipeline.yaml @@ -18,7 +18,7 @@ } } steps { - checkout([ + checkout( scm: [ $class: "GitSCM", branches: [ @@ -27,10 +27,8 @@ userRemoteConfigs: [ [url: "git@github.com:Talligent/openbook-core.git"] ], - poll: true, - changelog: false ] - ]) + ) } } stage("admin-api-server") { diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml index 0fca23b..75cf363 100644 --- a/jjb/yaml/openbook-pipeline.yaml +++ b/jjb/yaml/openbook-pipeline.yaml @@ -25,7 +25,7 @@ stages {{ stage("gradle") {{ steps {{ - checkout([ + checkout( scm: [ $class: "GitSCM", branches: [ @@ -33,18 +33,16 @@ ], userRemoteConfigs: [ [url: "git@github.com:Talligent/{artifact}.git"] - ], - poll: true, - changelog: false + ] ] - ]) + ) sh(script: "gradle -PbuildNumber=4.1.${{BUILD_NUMBER}} -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar") stash(includes: "build/libs/*.jar", name: "jar") }} }} stage("upload-jar") {{ steps {{ - checkout([ + checkout( scm: [ $class: "GitSCM", branches: [ @@ -54,19 +52,17 @@ [url: "git@github.com:Talligent/deployment-scripts.git"] ], extensions: [ - $class: "DisableRemotePoll" - ], - poll: false, - changelog: false + [$class: "DisableRemotePoll"] + ] ] - ]) + ) unstash(name: "jar") sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --version=4.1.${{BUILD_NUMBER}} --filepath=build/libs/{artifact}.4.1.${{BUILD_NUMBER}}.jar") }} }} stage("docker-container") {{ steps {{ - checkout([ + checkout( scm: [ $class: "GitSCM", branches: [ @@ -75,11 +71,11 @@ userRemoteConfigs: [ [url: "git@github.com:Talligent/openbook-v4-ci.git"] ], - $class: "DisableRemotePoll", - poll: false, - changelog: false + extensions: [ + [$class: "DisableRemotePoll"] + ] ] - ]) + ) sh(script: "./build-docker-containers.sh {artifact}") }} }} |