X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=b2f17c1e7a94d2a686174121be36b7d72566753b;hb=5facf6e1c57439569284b08ccf03e35cfb6a1672;hp=7b9983060533b58d8a243df35176479c76806866;hpb=948f47869a44e06aa026883e9b5085ed25fb5678;p=releng.git diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 7b9983060..b2f17c1e7 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -17,6 +17,34 @@ 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-daily-colorado-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-daily-colorado' + - 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' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - lf-pod1 + default-slaves: + - lf-pod1 - parameter: name: 'apex-verify-master-defaults' parameters: @@ -31,6 +59,42 @@ 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: + - intel-virtual3 + - intel-virtual4 + - intel-virtual5 + default-slaves: + - intel-virtual3 + - intel-virtual4 + - intel-virtual5 +- parameter: + name: 'apex-verify-colorado-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-verify-colorado' + - 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' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-virtual3 + - intel-virtual4 + - intel-virtual5 + default-slaves: + - intel-virtual3 + - intel-virtual4 + - intel-virtual5 - parameter: name: 'lf-pod1-defaults' parameters: @@ -86,6 +150,20 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'armband-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'armband-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' parameters: @@ -96,14 +174,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /srv - description: "Disks to use by ceph (comma separated list)" - string: name: EXTERNAL_NETWORK - default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 - description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" + default: ext-net + description: "External network floating ips" ##################################################### # Parameters for CI virtual PODs ##################################################### @@ -141,6 +215,20 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'armband-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'armband-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' parameters: @@ -151,6 +239,16 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'infra-virtual-trusty-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'infra-virtual-trusty' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # Parameters for build slaves ##################################################### @@ -197,6 +295,21 @@ 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: + - label: + name: SLAVE_LABEL + default: 'opnfv-build' + 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: 'huawei-build-defaults' parameters: @@ -228,6 +341,20 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'intel-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod1 + default-slaves: + - intel-pod1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'intel-pod2-defaults' parameters: @@ -322,6 +449,54 @@ 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.6.2' + description: 'IP of the installer' + - string: + name: BRIDGE + default: 'br6' + description: 'pxe bridge for booting of Fuel master' +- parameter: + name: 'zte-pod2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod2 + default-slaves: + - zte-pod2 + - 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: 'br7' + description: 'pxe bridge for booting of Fuel master' +- parameter: + name: 'zte-pod3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - zte-pod3 + default-slaves: + - zte-pod3 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BRIDGE + default: 'br0' + description: 'pxe bridge for booting of Fuel master' - parameter: name: 'juniper-pod1-defaults' parameters: @@ -340,6 +515,20 @@ name: CEPH_DISKS default: /srv description: "Disks to use by ceph (comma separated list)" +- parameter: + name: 'orange-pod1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - orange-pod1 + default-slaves: + - orange-pod1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'orange-pod2-defaults' parameters: @@ -354,14 +543,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: CEPH_DISKS - default: /dev/sdb /dev/sdc - description: "Disks to use by ceph by default (space separated list)" - - string: - name: EXTERNAL_NETWORK - default: ext-net;flat;161.105.231.2;161.105.231.62;161.105.231.1;161.105.231.0/26 - description: "External network to create (name;type;first ip;last ip; gateway;network)" - parameter: name: 'orange-pod5-defaults' parameters: @@ -423,71 +604,55 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - parameter: - name: 'arm-pod1-defaults' + name: 'arm-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - arm-pod1 + - arm-pod2 default-slaves: - - arm-pod1 + - arm-pod2 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: DEFAULT_BRIDGE - default: 'admin6_br0,public6_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - string: name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' - parameter: - name: 'arm-pod2-defaults' + name: 'intel-virtual6-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - arm-pod2 + - intel-virtual6 default-slaves: - - arm-pod2 + - intel-virtual6 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: DEFAULT_BRIDGE - default: 'admin_br0,public_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - - string: - name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config - description: 'Base URI to the configuration directory' - parameter: - name: 'intel-virtual6-defaults' + name: 'ool-virtual1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-virtual6 + - ool-virtual1 default-slaves: - - intel-virtual6 + - ool-virtual1 - 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 be used' ##################################################### # These slaves are just dummy slaves for sandbox jobs #####################################################