From: Alex Yang Date: Thu, 28 Sep 2017 11:01:45 +0000 (+0800) Subject: Move daisy jobs of master branch to zte-pod3 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=0f11af67383f2e3943b752018c25aeaba4a728a8 Move daisy jobs of master branch to zte-pod3 Zte-pod2 is a little busy. Change-Id: I7628a1a966552c5caf1706a2ac8c47952a11c095 Signed-off-by: Alex Yang --- diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 7b753836d..237861dba 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -31,9 +31,9 @@ # CI PODs #-------------------------------- pod: - - baremetal: - slave-label: daisy-baremetal - <<: *master +# - baremetal: +# slave-label: daisy-baremetal +# <<: *master - virtual: slave-label: daisy-virtual <<: *master @@ -46,6 +46,9 @@ #-------------------------------- # None-CI PODs #-------------------------------- + - baremetal: + slave-label: zte-pod3 + <<: *master #-------------------------------- # scenarios diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 2018dd582..8739a78a3 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -765,7 +765,7 @@ - string: name: BRIDGE default: 'br7' - description: 'pxe bridge for booting of Fuel master' + description: 'pxe bridge for booting of Daisy master' - parameter: name: 'zte-pod3-defaults' @@ -781,10 +781,14 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: INSTALLER_IP + default: '10.20.0.2' + description: 'IP of the installer' - string: name: BRIDGE default: 'br0' - description: 'pxe bridge for booting of Fuel master' + description: 'pxe bridge for booting of Daisy master' - parameter: name: zte-pod4-defaults