joid: Set and pass DEPLOY_SCENARIO

Change-Id: I4209f0aaf84bd4e0a455d8470e2555999bd1eddb
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index eb80906..66f886f 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -98,6 +98,9 @@
         - '{installer}-defaults'
         - '{pod}-defaults':
             installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
 
     builders:
         - multijob:
@@ -150,6 +153,9 @@
         - '{installer}-defaults'
         - '{pod}-defaults':
             installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
 
     scm:
         - git-scm:

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 282ced5..9dd3d54 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -89,7 +89,3 @@
             name: MAAS_REINSTALL
             default: 'false'
             description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-nofeature-ha'
-            description: "Scenario to deploy and test"