diff options
| -rw-r--r-- | jjb/yaml/openbook-all-pipeline.yaml | 15 | ||||
| -rw-r--r-- | jjb/yaml/openbook-core-pipeline.yaml | 15 | ||||
| -rw-r--r-- | jjb/yaml/openbook-pipeline.yaml | 45 |
3 files changed, 5 insertions, 70 deletions
diff --git a/jjb/yaml/openbook-all-pipeline.yaml b/jjb/yaml/openbook-all-pipeline.yaml index 5977181..1c5fbca 100644 --- a/jjb/yaml/openbook-all-pipeline.yaml +++ b/jjb/yaml/openbook-all-pipeline.yaml @@ -18,20 +18,7 @@ } } steps { - checkout( - scm: [ - $class: "GitSCM", - branches: [ - [name: "unstable"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/openbook-core.git"] - ], - extensions: [ - [$class: "DisableRemotePoll"] - ] - ] - ) + git(poll: false, branch: "unstable", url: "git@github.com:Talligent/openbook-core.git") } } stage("database") { diff --git a/jjb/yaml/openbook-core-pipeline.yaml b/jjb/yaml/openbook-core-pipeline.yaml index b8ef677..7a4da87 100644 --- a/jjb/yaml/openbook-core-pipeline.yaml +++ b/jjb/yaml/openbook-core-pipeline.yaml @@ -9,9 +9,6 @@ label "master" } } - triggers { - pollSCM "H/5 * * * *" - } stages { stage("checkout") { agent { @@ -21,17 +18,7 @@ } } steps { - checkout( - scm: [ - $class: "GitSCM", - branches: [ - [name: "unstable"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/openbook-core.git"] - ], - ] - ) + git(branch: "unstable", url: "git@github.com:Talligent/openbook-core.git") } } stage("admin-api-server") { diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml index a78e801..5fcfbbe 100644 --- a/jjb/yaml/openbook-pipeline.yaml +++ b/jjb/yaml/openbook-pipeline.yaml @@ -22,23 +22,10 @@ customWorkspace "workspace/{artifact}" }} }} - triggers {{ - pollSCM "H/5 * * * *" - }} stages {{ stage("gradle") {{ steps {{ - checkout( - scm: [ - $class: "GitSCM", - branches: [ - [name: "unstable"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/{artifact}.git"] - ] - ] - ) + git(branch: "unstable", url: "git@github.com:Talligent/{artifact}.git") sh(script: "/var/lib/jenkins/find_next_tag.sh \$(pwd) {artifact} 4.1") sh(script: "./gradlew -PbuildNumber=\$(cat /tmp/newtag_{artifact}) -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar") stash(includes: "build/libs/*.jar", name: "jar") @@ -46,40 +33,14 @@ }} stage("upload-jar") {{ steps {{ - checkout( - scm: [ - $class: "GitSCM", - branches: [ - [name: "master"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/deployment-scripts.git"] - ], - extensions: [ - [$class: "DisableRemotePoll"] - ] - ] - ) + git(poll: false, branch: "master", url: "git@github.com:Talligent/deployment-scripts.git") 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=\$(cat /tmp/newtag_{artifact}) --filepath=build/libs/{artifact}.\$(cat /tmp/newtag_{artifact}).jar") }} }} stage("docker-container") {{ steps {{ - checkout( - scm: [ - $class: "GitSCM", - branches: [ - [name: "master"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/openbook-v4-ci.git"] - ], - extensions: [ - [$class: "DisableRemotePoll"] - ] - ] - ) + git(poll: false, branch: "master", url: "git@github.com:Talligent/openbook-v4-ci.git") sh(script: "./build-docker-containers.sh {artifact}") }} }} |