diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-09 15:15:54 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-09 15:15:54 -0600 |
| commit | 52670171294c598910e3becada5f487bba0c9b75 (patch) | |
| tree | 5066a6d98f4bbf1204b59b3a9fbca8ba0dd9a8d6 | |
| parent | 95aaac84fa636496edad7688ff8a998f7b3ad8a6 (diff) | |
improvements in jjb files
| -rw-r--r-- | jjb/yaml/deploy-dev-env.yaml | 51 | ||||
| -rw-r--r-- | jjb/yaml/openbook-core.yaml | 5 | ||||
| -rw-r--r-- | jjb/yaml/openbook-pipeline.yaml | 25 |
3 files changed, 24 insertions, 57 deletions
diff --git a/jjb/yaml/deploy-dev-env.yaml b/jjb/yaml/deploy-dev-env.yaml index 1648c4a..105ef49 100644 --- a/jjb/yaml/deploy-dev-env.yaml +++ b/jjb/yaml/deploy-dev-env.yaml @@ -1,30 +1,27 @@ --- +- scm: + name: openbook-v4-installer + scm: + - git: + url: git@github.com:Talligent/openbook-v4-installer.git + branches: + - master + - job: name: deploy-dev-env - project-type: pipeline - dsl: | - pipeline { - agent { - node { - label "openbook_v4" - } - } - stages { - stage("deploy_dev_env") { - steps { - checkout([ - scm: [ - $class: "GitSCM", - branches: [ - [name: "master"] - ], - userRemoteConfigs: [ - [url: "git@github.com:Talligent/openbook-v4-installer.git"] - ] - ] - ]) - sh(script: "./deploy-dev-env.sh") - } - } - } - } + project-type: freestyle + triggers: + - reverse: + jobs: + - "admin-api-server-pipeline" + - "admin-web-ui-pipeline" + - "customer-api-server-pipeline" + - "customer-web-ui-pipeline" + - "job-scheduler-server-pipeline" + - "workflow-server-pipeline" + - "openbook-core-pipeline" + scm: + - openbook-v4-installer + builders: + shell: | + ./deploy-dev-env.sh diff --git a/jjb/yaml/openbook-core.yaml b/jjb/yaml/openbook-core.yaml index 6524dde..1fa5c1c 100644 --- a/jjb/yaml/openbook-core.yaml +++ b/jjb/yaml/openbook-core.yaml @@ -50,10 +50,5 @@ build(job: "workflow-server-pipeline") } } - stage("deploy_dev_env") { - steps { - build(job: "deploy-dev-env") - } - } } } diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml index 3dd632d..bef5d17 100644 --- a/jjb/yaml/openbook-pipeline.yaml +++ b/jjb/yaml/openbook-pipeline.yaml @@ -9,13 +9,7 @@ - "job-scheduler-server" - "workflow-server" jobs: - - "{artifact}-group" - -- job-group: - name: "{artifact}-group" - jobs: - "{artifact}-pipeline" - - "{artifact}-deploy-dev-env" - job-template: name: "{artifact}-pipeline" @@ -85,22 +79,3 @@ }} }} }} - -- job-template: - name: "{artifact}-deploy-dev-env" - project-type: pipeline - dsl: | - pipeline {{ - agent {{ - node {{ - label "openbook_v4" - }} - }} - stages {{ - stage("deploy_dev_env") {{ - steps {{ - build(job: "deploy-dev-env") - }} - }} - }} - }} |