From 7f815bbdf7f6f65ddefe89be4d925674536db1c2 Mon Sep 17 00:00:00 2001
From: Julien <zhang.jun3g@zte.com.cn>
Date: Mon, 12 Mar 2018 20:38:57 +0800
Subject: Update block rules on nodes
Only one scenario job can be excuted in the same POD. The rules should
be configured in job teamplate instead of parent job.
Change-Id: I9f672345985dbfdfe54b9ccd017a3a575a2ab412
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
---
jjb/daisy4nfv/daisy-daily-jobs.yml | 4 +++-
jjb/daisy4nfv/daisy-project-jobs.yml | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
(limited to 'jjb/daisy4nfv')
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index a9a0da2ee..043e40fb8 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -190,8 +190,10 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'daisy.*-deploy-({pod})?-daily-.*'
- 'daisy-kolla-build-.*'
+ - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
+ - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
block-level: 'NODE'
parameters:
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 006153f6f..c4edd7738 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -215,6 +215,13 @@
enabled: true
max-total: 6
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
+ - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+ block-level: 'NODE'
scm:
- git-scm
--
cgit