From e09952c1e3ad16537447d2f732403af4dd6a32ed Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Mon, 1 Feb 2016 15:24:31 +0100 Subject: build: Update slave-params.yml and jobs to use new build servers Change-Id: I69848dd40abf425acc671b332aec4199d4116ba3 Signed-off-by: Fatih Degirmenci --- jjb/opnfv/slave-params.yml | 50 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) (limited to 'jjb/opnfv/slave-params.yml') diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index daa4a4f1e..e1f9e448b 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -193,24 +193,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' -- parameter: - name: 'ericsson-build-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-build - default-slaves: - - ericsson-build - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'huawei-build-defaults' parameters: @@ -267,15 +249,10 @@ - parameter: name: 'opnfv-build-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-us-build-1 - - ericsson-ca-build-1 - default-slaves: - - intel-us-build-1 - - ericsson-ca-build-1 + - label: + name: SLAVE_LABEL + default: 'opnfv-build' + description: 'Slave label on Jenkins' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -315,21 +292,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' -- parameter: - name: 'ericsson-ca-build-1-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-ca-build-1 - default-slaves: - - ericsson-ca-build-1 - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'zte-build-1-defaults' parameters: @@ -426,11 +388,11 @@ description: 'Git URL to use on these Jenkins Slaves' - parameter: - name: 'fuel-build-defaults' + name: 'ericsson-build-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-build' + default: 'ericsson-build' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT -- cgit 1.2.3-korg