diff options
| author |   Julien <zhang.jun3g@zte.com.cn> | 2017-02-05 23:45:45 +0800 |
|---|---|---|
| committer | Julien <zhang.jun3g@zte.com.cn> | 2017-02-07 11:44:53 +0800 |
| commit | 2ed1b67a5fa1ce088b7b06cc9d1ed5421344d64c (patch) | |
| tree | 1e61f39c4dc19b25bb9f90221d54bba1cb197a60 /jjb/daisy4nfv | |
| parent | 56b4b6eaabd5a746bf33504cf1913c9c10df2a92 (diff) | |
Add daisy installer default parameters
Add default settings for installer and slaves
Use baremetal deployment for daily
Use virtual deployment for merge
JIRA: DAISY-27
Change-Id: Ia00343225656c02aa292ee89d153f2e047c994b0
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'jjb/daisy4nfv')
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index 9df732f5d..f712adb0a 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -2,6 +2,7 @@ # Add daily jobs, for buidoing, deploying and testing # TODO: # - [ ] Add yardstick and functest for test stage +# - [x] Use daisy-baremetal-defauls for choosing baremetal deployment ###################################################################### ############################# @@ -28,7 +29,7 @@ - 'build': slave-label: 'opnfv-build-centos' - 'deploy': - slave-label: 'opnfv-build-centos' + slave-label: 'daisy-baremetal' - 'test': slave-label: 'opnfv-build-centos' jobs: @@ -65,6 +66,7 @@ project: '{project}' branch: '{branch}' - 'opnfv-build-centos-defaults' + - 'daisy-defaults' - '{installer}-project-parameter': gs-pathname: '{gs-pathname}' @@ -155,6 +157,15 @@ - project-parameter: project: '{project}' branch: '{branch}' + - 'daisy-defaults' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + - 'daisy-defaults' - '{slave-label}-defaults' - '{installer}-project-parameter': gs-pathname: '{gs-pathname}' |