X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=4902dcfc5d263afc1d6daa5fa5e8161d6b19071d;hb=c592bdf51b90bf2ce827b08a3586d97c833ec9f5;hp=5136e7148d62ea376e4e5dc4b0b5d3598511decd;hpb=07730ca7325c1a1370874a801df5698a81ebc392;p=releng.git diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 5136e7148..4902dcfc5 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -178,6 +178,44 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' +- parameter: + name: 'lf-pod4-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod4 + default-slaves: + - lf-pod4 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + +- parameter: + name: 'lf-pod5-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod5 + default-slaves: + - lf-pod5 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + ##################################################### # Parameters for CI baremetal PODs ##################################################### @@ -980,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 @@ -998,30 +1040,6 @@ default: /root/.ssh/id_rsa 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: