summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-11-08 21:21:32 -0800
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-11-08 21:21:32 -0800
commit470b6fce404ab1632da2a4087dcf637321f62c1e (patch)
tree2bcb1dc009909343b1a7a691a154140cdba4fcf7 /jjb
parenta58549bb7a9f35929e99a3a3f60c09756b99b45e (diff)
Move Barometer Builds to lf-build2
Adds specific parameter for 'lf-build2' so it can be referenced with the '{build-server}-defaults' syntax and assigns barometer verify and merge jobs to lf-build2. Change-Id: If68dfc4e6ea81884870047360051795407c15af3 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/barometer/barometer.yaml4
-rw-r--r--jjb/global/slave-params.yaml18
2 files changed, 20 insertions, 2 deletions
diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 972848f3d..9cb222a2e 100644
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -32,7 +32,7 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'ericsson-build4-defaults'
+ - 'lf-build2-defaults'
scm:
- git-scm-gerrit
@@ -89,7 +89,7 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'ericsson-build4-defaults'
+ - 'lf-build2-defaults'
scm:
- git-scm
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 09a0d2287..1d8654c53 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -604,6 +604,24 @@
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
+ name: 'lf-build2-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'lf-build2'
+ description: 'Slave label on Jenkins'
+ all-nodes: false
+ node-eligibility: 'ignore-offline'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: BUILD_DIRECTORY
+ default: $WORKSPACE/build_output
+ description: "Directory where the build artifact will be located upon the completion of the build."
+
+- parameter:
name: 'ericsson-build3-defaults'
parameters:
- label: