Fix default controller downstream parameters.
Set default controller to none in installer config.
Change-Id: I33a36615b02783dab87bea27f0f15fa7f50f8a59
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
installer: 'apex'
controller:
installer: 'apex'
controller:
- - 'opencontrail'
- - 'opendaylight'
git-revision: true
block: true
predefined-parameters:
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-apex-daily-deploy-{stream}'
- job-template:
name: 'opnfv-apex-daily-deploy-{stream}'
installer: 'compass4nfv'
controller:
installer: 'compass4nfv'
controller:
- - 'opencontrail'
- - 'opendaylight'
git-revision: true
block: true
predefined-parameters:
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-compass4nfv-daily-deploy-{stream}'
- job-template:
name: 'opnfv-compass4nfv-daily-deploy-{stream}'
installer: 'fuel'
controller:
installer: 'fuel'
controller:
- - 'opencontrail'
- - 'opendaylight'
git-revision: true
block: true
predefined-parameters:
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-fuel-daily-deploy-{stream}'
- job-template:
name: 'opnfv-fuel-daily-deploy-{stream}'
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
description: 'Controller name'
- parameter:
description: 'Controller name'
- parameter:
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
description: 'Controller name'
- parameter:
description: 'Controller name'
- parameter:
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
description: 'Controller name'
- parameter:
description: 'Controller name'
- parameter:
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
description: 'Controller name'
description: 'Controller name'
description: 'Git URL for LF POD2'
description: 'Git URL to use on the jumphost'
description: 'Git URL for LF POD2'
description: 'Git URL to use on the jumphost'
+- parameter:
+ name: 'ericsson-pod1-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - ericsson-ca-deploy-bare-pod1
+ default-slaves:
+ - ericsson-ca-deploy-bare-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 the jumphost'
+
+
- parameter:
name: 'ericsson-pod2-defaults'
parameters:
- parameter:
name: 'ericsson-pod2-defaults'
parameters:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - ericsson-ca-fuel-bare-1
+ - ericsson-ca-deploy-bare-pod2
- - ericsson-ca-fuel-bare-1
+ - ericsson-ca-deploy-bare-pod2
- string:
name: INSTALLER_VERSION
default: latest
- string:
name: INSTALLER_VERSION
default: latest
description: 'Git URL to use on the jumphost'
- parameter:
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'huawei-sc-pod1-defaults'
+ name: 'huawei-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
parameters:
- node:
name: SLAVE_NAME