From a9cf10333f56f6bcef53867b624d084823c76b5c Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sat, 23 Jan 2016 20:04:38 +0100 Subject: joid: Set and pass DEPLOY_SCENARIO Change-Id: I4209f0aaf84bd4e0a455d8470e2555999bd1eddb Signed-off-by: Fatih Degirmenci --- jjb/joid/joid-ci-jobs.yml | 6 ++++++ jjb/opnfv/installer-params.yml | 4 ---- 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" -- cgit 1.2.3-korg