From 2ed1b67a5fa1ce088b7b06cc9d1ed5421344d64c Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 5 Feb 2017 23:45:45 +0800 Subject: Add daisy installer default parameters Add default settings for installer and slaves Use baremetal deployment for daily Use virtual deployment for merge JIRA: DAISY-27 Change-Id: Ia00343225656c02aa292ee89d153f2e047c994b0 Signed-off-by: Julien --- jjb/global/slave-params.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'jjb/global/slave-params.yml') diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index c87fc289c..8fc0207da 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -178,6 +178,23 @@ name: EXTERNAL_NETWORK default: ext-net description: "External network floating ips" +- parameter: + name: 'daisy-baremetal-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod2 + default-slaves: + - zte-pod2 + - label: + name: SLAVE_LABEL + default: 'daisy-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # Parameters for CI virtual PODs ##################################################### @@ -239,6 +256,24 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'daisy-virtual-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-virtual1 + - zte-virtual2 + default-slaves: + - zte-virtual1 + - label: + name: SLAVE_LABEL + default: 'daisy-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # Parameters for build slaves ##################################################### -- cgit 1.2.3-korg