diff options
| author |   Ryota Mibu <r-mibu@cq.jp.nec.com> | 2018-01-25 11:05:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-25 11:05:40 +0000 |
| commit | f6b74591649003b937b6038d109a3019cac2f9aa (patch) | |
| tree | 781a56c45db80e78f2c294c8e66737a5dd6c4bc8 /jjb/global | |
| parent | 5f73ab5e7935451dba7fc27c9026136cdd835605 (diff) | |
| parent | 5dcdbca2432e90bdcbb54383b61132e3c1d1b123 (diff) | |
Merge "[doctor] fix node-label setting"
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: |