From 1d1d80988e14c7f235c63d996be9fa2ccc5a5491 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 23 Mar 2017 16:33:45 +0800 Subject: Avoid build conflicts in build server Currently each job in daisy project has multiple child jobs, which may block the resources in lf-build1 for the excutors are limited. Change-Id: I7977128a550421caaeda395fce04b91b31d35751 Signed-off-by: Julien --- jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'jjb/daisy4nfv/daisy4nfv-merge-jobs.yml') 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: -- cgit 1.2.3-korg