summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-04-10 15:52:41 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-04-11 12:44:06 -0700
commita1affda5eb8a1f58c4143754a84a37276763dda5 (patch)
tree93fb0de618eca2a6a42bee473375268d6baae9b4 /jjb/daisy4nfv
parentd6bb024093f9c8427eaf966a4711d376997deb50 (diff)
Move DEPLOY_SCENARIO out of testapi-parameters
These have been moved back into installer-params.yml and added to the daisy jobs where 'testapi-parameters' is being used. Including this in the list of parameters would cause duplication as most installers already include 'DEPLOY_SCENARIO' as a parameter. The 'DEPLOY_SCENARIO' parameter is also sometimes defined through a macro, which could cause second declaration of DEPLOY_SCENARIO (defaulting to 'os-nosdn-nofeature-ha') to always be used. Documentation has been added to the parameter to explain the related macros and how they should be used. Change-Id: I9aef031dbcf523ae2db15695ce294bd85025530d Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb/daisy4nfv')
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 2eb27a663..0f2d917c3 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -121,6 +121,7 @@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - 'deploy-scenario'
builders:
- description-setter:
@@ -207,6 +208,7 @@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - 'deploy-scenario'
- string:
name: DEPLOY_TIMEOUT
default: '150'