diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-05 09:24:08 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-27 03:09:48 +0000 |
| commit | 66768daa8c15e43510adad5e02ff1f2b2499a07d (patch) | |
| tree | 7332074d030bb8ec4da02b0c446d2b7eab62680c | |
| parent | 173e8becfb41823891ccee9c937a52079cad747c (diff) | |
add ool-virtual2 and ool-virtual3
This patch adds two pods deployed by fuel and joid,
also adds non-voting jobs on fuel pod (ool-virtual2).
Change-Id: I5dbadbbeaebf75bb27930233d2609adbc2757ca5
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
| -rw-r--r-- | jjb/doctor/doctor.yml | 9 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 21 |
2 files changed, 27 insertions, 3 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 62f89e686..9b31cc2de 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -19,6 +19,13 @@ - apex: slave-label: 'ool-virtual1' pod: 'ool-virtual1' + - fuel: + slave-label: 'ool-virtual2' + pod: 'ool-virtual2' + # TODO(r-mibu): enable this once joid is ready + #- joid: + # slave-label: 'ool-virtual3' + # pod: 'ool-virtual3' inspector: - 'sample' @@ -34,7 +41,7 @@ jobs: - 'doctor-verify-{stream}' - - 'doctor-{task}-{installer}-{inspector}-{stream}': + - 'doctor-{task}-{installer}-{inspector}-{stream}' - job-template: name: 'doctor-verify-{stream}' diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 23ddbf882..57bb8bda3 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -683,15 +683,17 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ool-virtual1-defaults' + name: 'ool-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - ool-virtual1 + - ool-virtual2 + - ool-virtual3 default-slaves: - - ool-virtual1 + - '{default-slave}' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -701,6 +703,21 @@ default: /root/.ssh/id_rsa description: 'SSH key to be used' - parameter: + name: 'ool-virtual1-defaults' + parameters: + - 'ool-defaults': + default-slave: 'ool-virtual1' +- parameter: + name: 'ool-virtual2-defaults' + parameters: + - 'ool-defaults': + default-slave: 'ool-virtual2' +- parameter: + name: 'ool-virtual3-defaults' + parameters: + - 'ool-defaults': + default-slave: 'ool-virtual3' +- parameter: name: 'multisite-virtual-defaults' parameters: - label: |