summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-19 09:00:49 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-19 08:11:41 +0000
commit36a1430e9f8a78edf58b64be95e11987fafc2047 (patch)
tree8f65f7f2faa13a62d731c65a7ddd76938b71bd64 /jjb
parent462e6bb0ad56207b3ee86375f49458779557a71f (diff)
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>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-ci-jobs.yml3
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml3
2 files changed, 6 insertions, 0 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 9450a448b..2ce034dff 100644
--- 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 31243ff4e..f89dcbc75 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -85,6 +85,9 @@
- '{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
description: 'Path to test suite'