summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/opnfv-apex.yml6
-rw-r--r--jjb/compass4nfv/opnfv-compass4nfv.yml8
-rw-r--r--jjb/fuel/opnfv-fuel.yml6
-rw-r--r--jjb/opnfv/installer-params.yml8
-rw-r--r--jjb/opnfv/pod-params.yml26
5 files changed, 37 insertions, 17 deletions
diff --git a/jjb/apex/opnfv-apex.yml b/jjb/apex/opnfv-apex.yml
index 47de21c5a..cb605fb4e 100644
--- a/jjb/apex/opnfv-apex.yml
+++ b/jjb/apex/opnfv-apex.yml
@@ -8,9 +8,9 @@
installer: 'apex'
controller:
- - 'opencontrail'
- - 'opendaylight'
+ - 'odl'
- 'onos'
+ - 'opencontrail'
pod: 'intel-pod2'
@@ -52,7 +52,7 @@
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-apex-daily-deploy-{stream}'
diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml
index 0ae89dad3..b9dd53f04 100644
--- a/jjb/compass4nfv/opnfv-compass4nfv.yml
+++ b/jjb/compass4nfv/opnfv-compass4nfv.yml
@@ -8,11 +8,11 @@
installer: 'compass4nfv'
controller:
- - 'opencontrail'
- - 'opendaylight'
+ - 'odl'
- 'onos'
+ - 'opencontrail'
- pod: 'huawei-sc-pod1'
+ pod: 'huawei-pod1'
stream:
- master:
@@ -52,7 +52,7 @@
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-compass4nfv-daily-deploy-{stream}'
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index 92bd96b87..1e39bf686 100644
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -8,9 +8,9 @@
installer: 'fuel'
controller:
- - 'opencontrail'
- - 'opendaylight'
+ - 'odl'
- 'onos'
+ - 'opencontrail'
pod: 'lf-pod2'
@@ -53,7 +53,7 @@
git-revision: true
block: true
predefined-parameters:
- CONTROLLER='{controller}'
+ CONTROLLER={controller}
- job-template:
name: 'opnfv-fuel-daily-deploy-{stream}'
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