X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fslave-params.yml;h=b5464a766e066660c4e50198fbb0c335100a98f9;hb=9a245e701a5d8d22b2b7f508751182ffbe707342;hp=d70cd04d39a8f08a9ac72297fb3804db0bc40c09;hpb=0480843bcbd89f1c274bffa2b38f78ca842c08b6;p=releng.git diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index d70cd04d3..b5464a766 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -1,17 +1,14 @@ +##################################################### +# Parameters for slaves using old labels +# This will be cleaned up once the new job structure and +# use of the new labels are in place +##################################################### - parameter: - name: 'opnfv-jump-1-defaults' + name: 'apex-daily-master-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - opnfv-jump-1 - default-slaves: - - opnfv-jump-1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'apex-daily-master' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -20,82 +17,47 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - -- parameter: - name: 'opnfv-jump-2-defaults' - parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - opnfv-jump-2 - default-slaves: - - opnfv-jump-2 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - - string: - name: GIT_BASE - default: ssh://gerrit.opnfv.org:29418/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'ericsson-pod1-defaults' + name: 'apex-verify-master-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - ericsson-pod1 - default-slaves: - - ericsson-pod1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'apex-verify-master' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: POD_CONF_DIR - default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod1 - description: 'Directory where POD configuration files are located.' - + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' - parameter: - name: 'ericsson-pod2-defaults' + name: 'lf-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - ericsson-pod2 + - lf-pod1 default-slaves: - - ericsson-pod2 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - 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' +##################################################### +# Parameters for CI baremetal PODs +##################################################### - parameter: - name: 'intel-pod2-defaults' + name: 'apex-baremetal-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod2 - default-slaves: - - intel-pod2 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'apex-baremetal' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -104,63 +66,32 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - parameter: - name: 'intel-pod3-defaults' + name: 'compass-baremetal-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod3 - default-slaves: - - intel-pod3 + - label: + name: SLAVE_LABEL + default: 'compass-baremetal' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'intel-pod5-defaults' + name: 'fuel-baremetal-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod5 - default-slaves: - - intel-pod5 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'fuel-baremetal' - string: 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)" - - parameter: - name: 'intel-pod6-defaults' + name: 'joid-baremetal-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod6 - default-slaves: - - intel-pod6 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'joid-baremetal' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -171,23 +102,17 @@ description: "Disks to use by ceph (comma separated list)" - string: name: EXTERNAL_NETWORK - default: ext-net;flat;10.6.15.5;10.6.15.250;10.6.15.254;10.6.15.0/24 - description: "External network to create for pod6 (name;type;first ip;last ip; gateway;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)" +##################################################### +# Parameters for CI virtual PODs +##################################################### - parameter: - name: 'intel-pod7-defaults' + name: 'apex-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod7 - default-slaves: - - intel-pod7 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'apex-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -196,332 +121,261 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - parameter: - name: 'intel-pod8-defaults' + name: 'compass-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - intel-pod8 - default-slaves: - - intel-pod8 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'compass-virtual' - 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' + name: 'fuel-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-build - default-slaves: - - huawei-build - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'fuel-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'huawei-us-deploy-bare-1-defaults' + name: 'joid-virtual-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-us-deploy-bare-1 - default-slaves: - - huawei-us-deploy-bare-1 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'joid-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - +##################################################### +# Parameters for build slaves +##################################################### - parameter: - name: 'huawei-us-deploy-bare-2-defaults' + name: 'opnfv-build-arm-defaults' parameters: - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-us-deploy-bare-2 - default-slaves: - - huawei-us-deploy-bare-2 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - label: + name: SLAVE_LABEL + default: 'opnfv-build-arm' - 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-virtual-defaults' + name: 'opnfv-build-centos-defaults' parameters: - label: name: SLAVE_LABEL - default: 'huawei-deploy-vm' + default: 'opnfv-build-centos' - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + 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-ubuntu-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-ubuntu' + 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-sh-test-2-defaults' + name: 'huawei-build-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - huawei-sh-test-2 + - huawei-build default-slaves: - - huawei-sh-test-2 - - label: - name: SLAVE_LABEL - default: 'huawei-test' - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - huawei-build - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - +##################################################### +# Parameters for none-CI PODs +##################################################### - parameter: - name: 'huawei-sh-pod6-defaults' + name: 'ericsson-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - huawei-sh-pod6 + - ericsson-pod1 default-slaves: - - huawei-sh-pod6 - - label: - name: SLAVE_LABEL - default: 'huawei-test' - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' + - ericsson-pod1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'opnfv-build-defaults' + name: 'intel-pod2-defaults' parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build' - description: 'Slave label on Jenkins' + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod2 + default-slaves: + - intel-pod2 - 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." - + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' - parameter: - name: 'intel-build1-defaults' + name: 'intel-pod3-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-build1 + - intel-pod3 default-slaves: - - intel-build1 + - intel-pod3 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'intel-build2-defaults' + name: 'huawei-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-build2 + - huawei-pod2 default-slaves: - - intel-build2 + - huawei-pod2 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'intel-build3-defaults' + name: 'huawei-pod3-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-build3 + - huawei-pod3 default-slaves: - - intel-build3 + - huawei-pod3 + - label: + name: SLAVE_LABEL + default: 'huawei-test' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'zte-build-1-defaults' + name: 'huawei-pod4-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - zte-build-1 + - huawei-pod4 default-slaves: - - zte-build-1 + - huawei-pod4 + - label: + name: SLAVE_LABEL + default: 'huawei-test' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: - name: 'juniper-pod1-defaults' + name: 'zte-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - juniper-us-test-1 + - zte-pod1 default-slaves: - - juniper-us-test-1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - zte-pod1 - string: 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)" - - parameter: - name: 'orange-pod2-defaults' + name: 'juniper-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - orange-fr-pod2 + - juniper-pod1 default-slaves: - - orange-fr-pod2 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - juniper-pod1 - string: 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)" - + default: /srv + description: "Disks to use by ceph (comma separated list)" - parameter: - name: 'orange-test1-defaults' + name: 'orange-pod2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - orange-test1 + - orange-pod2 default-slaves: - - orange-test1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - orange-pod2 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: '{installer}-deploy-virtual' - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on these Jenkins Slaves' - -- parameter: - name: 'ericsson-build-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'ericsson-build' + name: CEPH_DISKS + default: /dev/sdb /dev/sdc + description: "Disks to use by ceph by default (space separated list)" - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on these Jenkins Slaves' - + 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: 'intel-virtual2-defaults' + name: 'orange-pod5-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-virtual2 + - orange-pod5 default-slaves: - - intel-virtual2 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' + - orange-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' - - parameter: name: 'dell-pod1-defaults' parameters: @@ -532,15 +386,10 @@ - dell-pod1 default-slaves: - dell-pod1 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'dell-pod2-defaults' parameters: @@ -551,15 +400,10 @@ - dell-pod2 default-slaves: - dell-pod2 - - string: - name: INSTALLER_VERSION - default: latest - description: 'Version of the installer to deploy' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'nokia-pod1-defaults' parameters: @@ -570,10 +414,6 @@ - nokia-pod1 default-slaves: - nokia-pod1 - - string: - name: INSTALLER_VERSION - default: stable - description: 'Version of the installer to deploy' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -582,33 +422,103 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - - parameter: - name: 'arm-build1-defaults' + name: 'arm-pod1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - arm-build1 + - arm-pod1 default-slaves: - - arm-build1 + - arm-pod1 - 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-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: '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' +##################################################### +# These slaves are just dummy slaves for sandbox jobs +##################################################### +- parameter: + name: 'sandbox-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'sandbox-baremetal' + 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: 'sandbox-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'sandbox-virtual' + 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: 'dummy-pod1-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'dummy-pod1' + 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."