diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2018-01-24 11:29:28 +0900 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2018-01-24 20:22:23 +0900 |
| commit | 5dcdbca2432e90bdcbb54383b61132e3c1d1b123 (patch) | |
| tree | 745e65d98a7cf20f4c9eb8be115aeaeab44ff623 /jjb/global | |
| parent | 4b1560c6499e53efb3b2ca83294265052396b2d5 (diff) | |
[doctor] fix node-label setting
Current doctor verify jobs need to be run on relevant pods which are
specified by slave-label. But, after multijob introduced, the parameter
is not passed to children jobs. Also, 'phase' of project is misleading,
as it isn't multijob's phase.
This patch makes sure each doctor job run on correct pod by updating
node label rule for doctor pod to 'doctor-{installer}-{arch}'.
This patch also merges doctor slave parameter definitions into one,
and deletes unnecessary setting where default are set.
Change-Id: Ic9bf218ae7fb4f9866b510efd1e0ccd19277b78e
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/slave-params.yml | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 5c1c7df8f..4902dcfc5 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -1018,15 +1018,19 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'doctor-defaults' + name: 'doctor-slave-parameter' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - '{default-slave}' + - 'doctor-apex-x86_64' + - 'doctor-fuel-x86_64' + - 'doctor-fuel-aarch64' + - 'doctor-joid-x86_64' + - 'not-specified' default-slaves: - - '{default-slave}' + - 'not-specified' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -1037,30 +1041,6 @@ description: 'SSH key to be used' - parameter: - name: 'doctor-apex-verify-defaults' - parameters: - - 'doctor-defaults': - default-slave: 'doctor-apex-verify' - -- parameter: - name: 'doctor-fuel-verify-defaults' - parameters: - - 'doctor-defaults': - default-slave: 'doctor-fuel-verify' - -- parameter: - name: 'doctor-fuel-build-aarch64-verify-defaults' - parameters: - - 'doctor-defaults': - default-slave: 'doctor-fuel-build-aarch64-verify' - -- parameter: - name: 'doctor-joid-verify-defaults' - parameters: - - 'doctor-defaults': - default-slave: 'doctor-joid-verify' - -- parameter: name: 'multisite-virtual-defaults' parameters: - label: |