summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-23 20:04:38 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-25 07:35:16 +0000
commita9cf10333f56f6bcef53867b624d084823c76b5c (patch)
tree8982435cb3d3e2d11dd663185178b5b32d1b2f0b
parent51f8b2dbaac66424e1c7cb67422e10f8cec9471c (diff)
joid: Set and pass DEPLOY_SCENARIO
Change-Id: I4209f0aaf84bd4e0a455d8470e2555999bd1eddb Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/joid/joid-ci-jobs.yml6
-rw-r--r--jjb/opnfv/installer-params.yml4
2 files changed, 6 insertions, 4 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index eb8090635..66f886f5d 100644
--- 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 282ced5cc..9dd3d5406 100644
--- 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"