summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2014-04-25 15:18:16 +0200
committerGuido Günther <agx@sigxcpu.org>2014-04-25 15:49:24 +0200
commitf0b9234d130d31a11187c6b521d469c03dca3e4b (patch)
tree84b88128dbdca9c2497d1bec8cb572d7c07958cb
parent4c789f3403b89c8ba1802c1a7e7f0ff8a9b3af56 (diff)
Move to labeled builds
The jenkins slaves now have a label for the build type and we use the parameterized builds and node label plugins to run the whole build chains on these slaves.
-rw-r--r--autotools_templates.yaml40
-rw-r--r--python_templates.yaml6
-rw-r--r--templates.yaml8
3 files changed, 33 insertions, 21 deletions
diff --git a/autotools_templates.yaml b/autotools_templates.yaml
index 356e426..c1ff573 100644
--- a/autotools_templates.yaml
+++ b/autotools_templates.yaml
@@ -5,20 +5,22 @@
disabled: false
display-name: '{name} build'
concurrent: true
- workspace: 'jobs/{name}-clone'
+ workspace: 'workspace/{name}-clone/{name}'
quiet-period: 0
builders:
- - shell: |
- cd workspace/{name}
- if [ -x ./configure ]; then
- ./configure
- else
- ./autogen.sh
- fi
- make
+ - shell: |
+ if [ -x ./configure ]; then
+ ./configure
+ else
+ ./autogen.sh
+ fi
+ make
+
+ - trigger-builds:
+ - project: '{name}-autotools-check'
+ block: true
+ same-node: true
publishers:
- - trigger:
- project: '{name}-autotools-check'
- email:
recipients: '{mail-to}'
@@ -29,15 +31,17 @@
disabled: false
display-name: '{name} check'
concurrent: true
- workspace: 'jobs/{name}-clone'
+ workspace: 'workspace/{name}-clone/{name}'
quiet-period: 0
builders:
- shell: |
- cd workspace/{name}
make check
+
+ - trigger-builds:
+ - project: '{name}-autotools-distcheck'
+ block: true
+ same-node: true
publishers:
- - trigger:
- project: '{name}-autotools-distcheck'
- email:
recipients: '{mail-to}'
@@ -48,11 +52,13 @@
disabled: false
display-name: '{name} distcheck'
concurrent: true
- workspace: 'jobs/{name}-clone'
+ workspace: 'workspace/{name}-clone/{name}'
quiet-period: 0
builders:
- shell: |
- cd workspace/{name}
make distcheck
+
+ publishers:
- email:
recipients: '{mail-to}'
+
diff --git a/python_templates.yaml b/python_templates.yaml
index 1a5b1ed..a913bc6 100644
--- a/python_templates.yaml
+++ b/python_templates.yaml
@@ -5,10 +5,12 @@
disabled: false
display-name: '{name} python tests via tox'
concurrent: true
- workspace: 'jobs/{name}-clone'
+ workspace: 'workspace/{name}-clone'
quiet-period: 0
builders:
- - shell: tox
+ - shell: |
+ cd {name}
+ tox
publishers:
- email:
recipients: '{mail-to}'
diff --git a/templates.yaml b/templates.yaml
index ff6ba37..0c44693 100644
--- a/templates.yaml
+++ b/templates.yaml
@@ -1,5 +1,6 @@
- job-template:
name: '{name}-clone'
+ node: '{buildtype}'
defaults: global
scm:
- git:
@@ -10,9 +11,12 @@
shallow-clone: True
triggers:
- pollscm: "* * * * *"
+ builders:
+ - trigger-builds:
+ - project: '{name}-{buildtype}-build'
+ block: true
+ same-node: true
publishers:
- - trigger:
- project: '{name}-{buildtype}-build'
- email:
recipients: '{mail-to}'