X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yml;h=6171a6abd2498b423ca30df8961862931833c172;hb=abd754f9358035062d977c46b4e9e0a171cf5261;hp=5b94607e57e4ccf65e10e9f3c619f95a625ed30c;hpb=2ec02b9acd6bcdf251ef5ae1cb8a4a304aed1195;p=releng.git diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 5b94607e5..6171a6abd 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -18,13 +18,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - parameter: name: 'apex-baremetal-euphrates-defaults' @@ -40,13 +33,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 - parameter: name: 'apex-baremetal-danube-defaults' @@ -62,13 +48,7 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-pod1 - default-slaves: - - lf-pod1 + - parameter: name: 'apex-virtual-master-defaults' @@ -84,15 +64,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-virtual2 - - lf-virtual3 - default-slaves: - - lf-virtual2 - - lf-virtual3 - parameter: name: 'apex-virtual-euphrates-defaults' @@ -108,15 +79,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - lf-virtual2 - - lf-virtual3 - default-slaves: - - lf-virtual2 - - lf-virtual3 - parameter: name: 'apex-virtual-danube-defaults' @@ -132,6 +94,29 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' + +- parameter: + name: 'lf-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod1 + default-slaves: + - lf-pod1 + - 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-pod3-defaults' + parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' @@ -139,17 +124,25 @@ - lf-pod3 default-slaves: - lf-pod3 + - 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-pod1-defaults' + name: 'lf-pod4-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - lf-pod1 + - lf-pod4 default-slaves: - - lf-pod1 + - lf-pod4 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -160,15 +153,15 @@ description: 'SSH key to use for Apex' - parameter: - name: 'lf-pod3-defaults' + name: 'lf-pod5-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - lf-pod3 + - lf-pod5 default-slaves: - - lf-pod3 + - lf-pod5 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -440,6 +433,22 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: + name: 'pharos-dashboard-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'pharos-dashboard' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - parameter: name: 'opnfv-build-defaults' parameters: @@ -456,6 +465,18 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: + name: 'ericsson-build3-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'ericsson-build3' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - parameter: name: 'huawei-build-defaults' parameters: @@ -634,6 +655,20 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT +- parameter: + name: 'intel-pod17-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod17 + default-slaves: + - intel-pod17 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + - parameter: name: 'huawei-virtual5-defaults' parameters: @@ -742,15 +777,53 @@ description: 'pxe bridge for booting of Daisy master' - parameter: - name: zte-pod4-defaults + name: 'zte-pod9-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod9 + default-slaves: + - zte-pod9 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: INSTALLER_IP + default: '10.20.7.2' + description: 'IP of the installer' + - string: + name: BRIDGE + default: 'br0' + description: 'pxe bridge for booting of Daisy master' + +- parameter: + name: zte-virtual5-defaults + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-virtual5 + default-slaves: + - zte-virtual5 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: + name: zte-virtual6-defaults parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - zte-pod4 + - zte-virtual6 default-slaves: - - zte-pod4 + - zte-virtual6 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -900,15 +973,20 @@ 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' + - 'doctor-daisy-x86_64' + - 'not-specified' default-slaves: - - '{default-slave}' + - 'not-specified' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -918,24 +996,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-joid-verify-defaults' - parameters: - - 'doctor-defaults': - default-slave: 'doctor-joid-verify' - - parameter: name: 'multisite-virtual-defaults' parameters: