summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-09 21:54:46 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-10 09:59:00 +0000
commitf156db42ccce2a80c05950d2f4433c8da38a14b0 (patch)
tree95bc0eed5aa6ba8fc66abf90104d1b3b8a334952 /jjb/opnfv
parentb3d7ef87b028669677dc9749f426d4cf31db11e0 (diff)
Add ericsson pod2 to pod-params
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>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/installer-params.yml8
-rw-r--r--jjb/opnfv/pod-params.yml26
2 files changed, 27 insertions, 7 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index dc11fbd53..26feee43d 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -15,7 +15,7 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
+ default: none
description: 'Controller name'
- parameter:
@@ -35,7 +35,7 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
+ default: none
description: 'Controller name'
- parameter:
@@ -55,7 +55,7 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
+ default: none
description: 'Controller name'
- parameter:
@@ -75,5 +75,5 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: CONTROLLER
- default: '{controller}'
+ default: none
description: 'Controller name'
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index e62450c18..275311ab6 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -42,15 +42,35 @@
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:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - ericsson-ca-fuel-bare-1
+ - ericsson-ca-deploy-bare-pod2
default-slaves:
- - ericsson-ca-fuel-bare-1
+ - ericsson-ca-deploy-bare-pod2
- string:
name: INSTALLER_VERSION
default: latest
@@ -141,7 +161,7 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'huawei-sc-pod1-defaults'
+ name: 'huawei-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME