From 946147ef544271432a6fd02b1c8d99326af7ddd7 Mon Sep 17 00:00:00 2001
From: meimei <meimei@huawei.com>
Date: Fri, 8 Jan 2016 14:50:09 +0800
Subject: 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>
---
 jjb/opnfv/slave-params.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'jjb/opnfv')

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
@@ -185,6 +185,43 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             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:
@@ -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'
-- 
cgit 1.2.3-korg