From 470b6fce404ab1632da2a4087dcf637321f62c1e Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Thu, 8 Nov 2018 21:21:32 -0800 Subject: [PATCH] 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 --- jjb/barometer/barometer.yaml | 4 ++-- jjb/global/slave-params.yaml | 18 ++++++++++++++++++ 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 @@ -603,6 +603,24 @@ default: $WORKSPACE/build_output 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: -- 2.16.6