diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 40 | ||||
| -rw-r--r-- | jjb/opnfv/pod-params.yml | 57 |
2 files changed, 61 insertions, 36 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 956e67da8..64945c656 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -6,17 +6,9 @@ default: '192.168.X.X' description: 'IP of the installer' - string: - name: INSTALLER_NAME - default: apex - description: 'Installer used for deploying OPNFV on this POD' - - string: name: INSTALLER_TYPE - default: $INSTALLER_NAME + default: apex description: 'Installer used for deploying OPNFV on this POD' - - string: - name: CONTROLLER - default: none - description: 'Controller name' - parameter: name: 'compass-defaults' @@ -26,17 +18,9 @@ default: '192.168.200.2' description: 'IP of the installer' - string: - name: INSTALLER_NAME - default: compass4nfv - description: 'Installer used for deploying OPNFV on this POD' - - string: name: INSTALLER_TYPE - default: $INSTALLER_NAME + default: compass description: 'Installer used for deploying OPNFV on this POD' - - string: - name: CONTROLLER - default: none - description: 'Controller name' - parameter: name: 'fuel-defaults' @@ -46,17 +30,9 @@ default: '10.20.0.2' description: 'IP of the installer' - string: - name: INSTALLER_NAME - default: fuel - description: 'Installer used for deploying OPNFV on this POD' - - string: name: INSTALLER_TYPE - default: $INSTALLER_NAME + default: fuel description: 'Installer used for deploying OPNFV on this POD' - - string: - name: CONTROLLER - default: none - description: 'Controller name' - parameter: name: 'joid-defaults' @@ -66,14 +42,6 @@ default: '192.168.Y.Y' description: 'IP of the installer' - string: - name: INSTALLER_NAME - default: joid - description: 'Installer used for deploying OPNFV on this POD' - - string: name: INSTALLER_TYPE - default: $INSTALLER_NAME + default: joid description: 'Installer used for deploying OPNFV on this POD' - - string: - name: CONTROLLER - default: none - description: 'Controller name' diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index 317f5cdc1..e36a0b684 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -102,6 +102,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'intel-pod3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod3 + default-slaves: + - intel-pod3 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the jumphost' + +- parameter: name: 'intel-pod5-defaults' parameters: - node: @@ -296,3 +311,45 @@ 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' |