X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fpod-params.yml;h=bb5e529b758e20a503458307421d2a97ee4e7925;hb=bd626d8540736619af7f57c45b036de4454022fc;hp=6a2650667198ee20c19ad9977bd8e0f15e1c5d10;hpb=4163f6bfb811c17dc22e68c7a2ef1ed30293feaf;p=releng.git diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index 6a2650667..bb5e529b7 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -39,14 +39,6 @@ name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: 'Git URL to use on the jumphost' - - string: - name: YARDSTICK_TEST_SUITE - default: opnfv_${{NODE_NAME}}_{loop}.yaml - description: 'Path to test suite' - - string: - name: YARDSTICK_DB_BACKEND - default: 'db_args' - description: 'Arguments to use in order to choose the backend DB' - parameter: name: 'ericsson-pod1-defaults' @@ -66,10 +58,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on the jumphost' - - string: - name: YARDSTICK_TEST_SUITE - default: opnfv_${{NODE_NAME}}_{loop}.yaml - description: 'Path to test suite' - parameter: name: 'ericsson-pod2-defaults' @@ -265,3 +253,88 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on the slave' + +- parameter: + name: 'orange-pod2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - orange-fr-pod2 + default-slaves: + - orange-fr-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 the jumphost' + - string: + name: LAB_CONFIG + default: "/home/opnfv/repos/functest" + description: "Openstack credentials on the dev lab" + + +- parameter: + name: 'orange-test1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - orange-test1 + default-slaves: + - orange-test1 + - 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 the jumphost' + +- parameter: + name: 'intel-us-deploy-virtual-1-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-deploy-virtual-1 + default-slaves: + - intel-us-deploy-virtual-1 + - 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 the jumphost' + +- parameter: + name: 'intel-us-deploy-virtual-2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-deploy-virtual-2 + default-slaves: + - intel-us-deploy-virtual-2 + - 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 the jumphost' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex'