diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-03-27 02:32:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-27 02:32:49 +0000 |
| commit | eab89fda5f0fde5b8c608b7facb3f8d45970a8ec (patch) | |
| tree | 63b9f671f4a9db018ec07615a907f4eb80b9b45e /jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | |
| parent | 2bfc153956db44a47d4c58fa4bc4afc1c3b8a701 (diff) | |
| parent | 1d1d80988e14c7f235c63d996be9fa2ccc5a5491 (diff) | |
Merge "Avoid build conflicts in build server"
Diffstat (limited to 'jjb/daisy4nfv/daisy4nfv-merge-jobs.yml')
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 11531f4a4..95e72e550 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -21,7 +21,7 @@ - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch merge phases ##################################### @@ -148,7 +148,8 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-deploy-.*' + - '{alias}-(merge|verify)-.*' + - '{project}-daily-.*' block-level: 'NODE' scm: |