test: Set DEPLOY_SCENARIO to Arno scenario by default

So it can be overriden by multijob when/if started automatically
and changed by hand when they are started manually.

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

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 9450a44..2ce034d 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -81,6 +81,9 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 31243ff..f89dcbc 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -84,6 +84,9 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'yardstick-params-{pod}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - string:
             name: YARDSTICK_SUITE_NAME
             default: opnfv_${{NODE_NAME}}_{loop}.yaml