diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-09-30 01:23:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-30 01:23:48 +0000 |
| commit | fa7c5d4f2024565623dc9d47e8dd900f0628443a (patch) | |
| tree | 8077997b0437ad6202ba55ce39610532b21a92d9 | |
| parent | 994a8c5d5c4bad0d5920851ca435bfef04dd2de4 (diff) | |
| parent | 0f11af67383f2e3943b752018c25aeaba4a728a8 (diff) | |
Merge "Move daisy jobs of master branch to zte-pod3"
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 8 |
2 files changed, 12 insertions, 5 deletions
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' @@ -782,9 +782,13 @@ 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 |