X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fslave-params.yaml;h=2fd701f6ce49485f8b640a5fe4317a34fae95ad6;hb=b2d1bf8e0916902cbd17f5e8c8fd8768126367bc;hp=c759cf3a553ad5fb0b46a3f1ccedf33afad8e0cd;hpb=d9cc90d067ea86d3c07685448491570d4ba4a7af;p=releng.git diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index c759cf3a5..2fd701f6c 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -304,44 +304,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' -- parameter: - name: 'compass-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-baremetal-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal-master' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-baremetal-branch-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal-branch' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'fuel-baremetal-defaults' @@ -443,58 +405,6 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' -- parameter: - name: 'compass-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-arm-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-arm-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-virtual-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual-master' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-virtual-branch-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual-branch' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'fuel-virtual-defaults' parameters: @@ -611,11 +521,11 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'pharos-dashboard-defaults' + name: 'lf-virtual1-defaults' parameters: - label: name: SLAVE_LABEL - default: 'pharos-dashboard2' + default: 'lf-virtual1' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -629,11 +539,11 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'opnfv-build-defaults' + name: 'laas-dashboard-defaults' parameters: - label: name: SLAVE_LABEL - default: 'opnfv-build' + default: 'laas-dashboard' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -647,11 +557,11 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'lf-build2-defaults' + name: 'opnfv-build-defaults' parameters: - label: name: SLAVE_LABEL - default: 'lf-build2' + default: 'opnfv-build' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -665,25 +575,11 @@ 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' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'ericsson-build4-defaults' + name: 'lf-build2-defaults' parameters: - label: name: SLAVE_LABEL - default: 'ericsson-build4' + default: 'lf-build2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' @@ -841,6 +737,25 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'itri-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - itri-pod1 + default-slaves: + - itri-pod1 + - 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.0.2' + description: 'IP of the installer' + - parameter: name: 'huawei-pod3-defaults' parameters: @@ -895,6 +810,21 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT + +- parameter: + name: 'intel-pod15-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod15 + default-slaves: + - intel-pod15 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + - parameter: name: 'intel-pod17-defaults' parameters: