summaryrefslogtreecommitdiff
path: root/jjb/yaml
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-10-09 16:17:19 -0600
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-10-09 16:17:19 -0600
commitb5d4cb39b4310daa8fd9680bfd5dbee8aee41cfb (patch)
treea554583994727937307fcfe21637173d89a9947e /jjb/yaml
parent52670171294c598910e3becada5f487bba0c9b75 (diff)
improvements in jjb files
Diffstat (limited to 'jjb/yaml')
-rw-r--r--jjb/yaml/deploy-dev-env.yaml19
-rw-r--r--jjb/yaml/openbook-core.yaml8
-rw-r--r--jjb/yaml/openbook-pipeline.yaml1
3 files changed, 18 insertions, 10 deletions
diff --git a/jjb/yaml/deploy-dev-env.yaml b/jjb/yaml/deploy-dev-env.yaml
index 105ef49..b9828e0 100644
--- a/jjb/yaml/deploy-dev-env.yaml
+++ b/jjb/yaml/deploy-dev-env.yaml
@@ -1,15 +1,13 @@
---
-- 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: freestyle
+ node: openbook_v4
+ properties:
+ - build-discarder:
+ days-to-keep: 0
+ num-to-keep: 1
+ artifact-days-to-keep: 0
triggers:
- reverse:
jobs:
@@ -21,7 +19,10 @@
- "workflow-server-pipeline"
- "openbook-core-pipeline"
scm:
- - openbook-v4-installer
+ - git:
+ url: git@github.com:Talligent/openbook-v4-installer.git
+ branches:
+ - master
builders:
shell: |
./deploy-dev-env.sh
diff --git a/jjb/yaml/openbook-core.yaml b/jjb/yaml/openbook-core.yaml
index 1fa5c1c..e0f1830 100644
--- a/jjb/yaml/openbook-core.yaml
+++ b/jjb/yaml/openbook-core.yaml
@@ -6,7 +6,7 @@
pipeline {
agent {
node {
- label "openbook_v4"
+ label "master"
}
}
triggers {
@@ -14,6 +14,12 @@
}
stages {
stage("checkout") {
+ agent {
+ node {
+ label "openbook_v4"
+ customWorkspace "workspace/openbook-core"
+ }
+ }
steps {
checkout([
scm: [
diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml
index bef5d17..6300bad 100644
--- a/jjb/yaml/openbook-pipeline.yaml
+++ b/jjb/yaml/openbook-pipeline.yaml
@@ -19,6 +19,7 @@
agent {{
node {{
label "openbook_v4"
+ customWorkspace "workspace/{artifact}"
}}
}}
triggers {{