diff options
| author |   Julien <zhang.jun3g@zte.com.cn> | 2017-04-01 11:42:19 +0800 |
|---|---|---|
| committer | Julien <zhang.jun3g@zte.com.cn> | 2017-04-01 14:35:07 +0800 |
| commit | 364b8f8faea3b26de698f20444f0703c0b9efba2 (patch) | |
| tree | 4817371d250f1dfadc87f487e450864943e013f7 /jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | |
| parent | cec072a7346f75c2670dfa44c8305f7b7841fe67 (diff) | |
Update block parameters
Fix issue:
1. father job block child jobs
2. deploy the env in daisy-virtual slaves
Change-Id: Idcda4b8ca5fcf9abbfae3c60bf656a0901a20e02
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'jjb/daisy4nfv/daisy4nfv-merge-jobs.yml')
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 95e72e550..9e7b867af 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -29,7 +29,7 @@ - 'build': slave-label: 'opnfv-build-centos' - 'deploy-virtual': - slave-label: 'opnfv-build-centos' + slave-label: 'daisy-virtual' ##################################### # jobs ##################################### @@ -148,8 +148,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-(merge|verify)-.*' - - '{project}-daily-.*' + - '{alias}-merge-(master|danube)' block-level: 'NODE' scm: |