summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-01-08 14:50:09 +0800
committermeimei <meimei@huawei.com>2016-01-08 18:23:27 +0800
commit946147ef544271432a6fd02b1c8d99326af7ddd7 (patch)
tree36b4733d83681bc2a0741b1b840a4dc4440d965d /jjb/opnfv
parentac1003f22ee1929d74278a1e3c1434bba02d5428 (diff)
Enable compass Arno scenario for master and stable/brahmaputra
This patch proposes below changes: - Run CI on intel-pod8(master) & huawei-us-deploy-bare-1(brahmaputra) - Configure functest and yardstick against both branches on both PODs Change-Id: Ie46f938f9485a43ff93650ef37f84d7bc211acb8 Signed-off-by: meimei <meimei@huawei.com> Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/slave-params.yml55
1 files changed, 55 insertions, 0 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index cb9d08fed..4e169a83e 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -186,6 +186,43 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'ericsson-build-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - ericsson-build
+ default-slaves:
+ - ericsson-build
+ - string:
+ name: INSTALLER_VERSION
+ default: stable
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'huawei-build-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - huawei-build
+ default-slaves:
+ - huawei-build
+ - string:
+ name: INSTALLER_VERSION
+ default: stable
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
name: 'huawei-us-deploy-bare-1-defaults'
parameters:
- node:
@@ -203,6 +240,24 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'huawei-deploy-vm-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - huawei-us-deploy-vm-1
+ default-slaves:
+ - huawei-us-deploy-vm-1
+ - string:
+ name: INSTALLER_VERSION
+ default: stable
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
- parameter:
name: 'opnfv-build-defaults'