diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-05-26 02:27:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-26 02:27:03 +0000 |
| commit | 88a4c77b4bfd3faf01bbe7e0a5173b6dd53a8350 (patch) | |
| tree | bdb96793dadaeb99129aef1cc045b94f53e6cf7b /jjb/daisy4nfv | |
| parent | b02bc03691fda71399390a69ca1b056ce6bd7eac (diff) | |
| parent | 1afb0ddd6faa02d364e9537ba78943e166039cc1 (diff) | |
Merge "define default parameters for daisy"
Diffstat (limited to 'jjb/daisy4nfv')
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 1 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index e631ee9b9..0a9d43d25 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -71,7 +71,7 @@ project: '{project}' branch: '{branch}' - 'opnfv-build-centos-defaults' - - 'daisy-defaults' + - '{installer}-defaults' - '{installer}-project-parameter': gs-pathname: '{gs-pathname}' @@ -157,7 +157,8 @@ - project-parameter: project: '{project}' branch: '{branch}' - - 'daisy-defaults' + - '{installer}-defaults' + - '{slave-label}-defaults' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -165,8 +166,6 @@ - string: name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-ha' - - 'daisy-defaults' - - '{slave-label}-defaults' - '{installer}-project-parameter': gs-pathname: '{gs-pathname}' diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 48620fd58..561ffbe24 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -169,6 +169,7 @@ - project-parameter: project: '{project}' branch: '{branch}' + - '{installer}-defaults' - '{slave-label}-defaults' - '{alias}-merge-defaults': gs-pathname: '{gs-pathname}' diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index aac7d407c..dff0ff0a4 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -162,6 +162,7 @@ - project-parameter: project: '{project}' branch: '{branch}' + - '{installer}-defaults' - '{slave-label}-defaults' - '{alias}-verify-defaults': gs-pathname: '{gs-pathname}' |