From 62b0d5baa45d18fb8553aeb5cc2424764a4fac4a Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Thu, 7 Jan 2016 11:10:38 +0100
Subject: Enable joid Arno scenario for master and stable/brahmaputra

This patch proposes below changes:
- Run CI on intel-pod5 against stable/brahmaputra branch
- Run CI on intel-pod6 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until Arno scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO

Please note that there are some duplications which need to be taken
care of in a separate patch.

Change-Id: Ic3deb77692cdb0908808fdb21098af77b937b831
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/opnfv/installer-params.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'jjb/opnfv/installer-params.yml')

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 8a189ece8..3e5c0ffac 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -14,9 +14,9 @@
             default: 'nosdn'
             description: 'SDN Controller to use'
         - string:
-            name: OPNFV_FEATURE
+            name: DEPLOY_SCENARIO
             default: 'none'
-            description: 'OPNFV Feature to activate'
+            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'net04_ext'
@@ -38,9 +38,9 @@
             default: 'nosdn'
             description: 'SDN Controller to use'
         - string:
-            name: OPNFV_FEATURE
+            name: DEPLOY_SCENARIO
             default: 'none'
-            description: 'OPNFV Feature to activate'
+            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'ext-net'
@@ -61,14 +61,10 @@
             name: SDN_CONTROLLER
             default: 'nosdn'
             description: 'SDN Controller to use'
-        - string:
-            name: OPNFV_FEATURE
-            default: 'none'
-            description: 'OPNFV Feature to activate'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'test'
-            description: 'OPNFV Deployment Scenario'
+            default: 'none'
+            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'net04_ext'
@@ -90,9 +86,9 @@
             default: 'nosdn'
             description: 'SDN Controller to use'
         - string:
-            name: OPNFV_FEATURE
+            name: DEPLOY_SCENARIO
             default: 'none'
-            description: 'OPNFV Feature to activate'
+            description: 'Scenario to deploy and test'
         - string:
             name: HA_MODE
             default: 'ha'
-- 
cgit 1.2.3-korg