diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-02-15 07:21:44 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-02-15 11:07:54 +0000 |
| commit | f9a52671752efe3d4404343f5fafbeda6498464b (patch) | |
| tree | 8f20c553022a993149522bbe21fb739a897e893c | |
| parent | 8b2d00b74b608242afbdbf46796d45a5189327f2 (diff) | |
jjb: xci: Add missing job blockers for XCI merge jobs
We shouldn't allow the merge jobs to run in parallel with the verify
ones when both are testing the same distro since one may wipe the
'clean VM' of the other one. Moreover, we should restrict the number of
jobs allocated on nodes in order to avoid overloading them.
Change-Id: I9c0b9b5061e41b21c01789fc4676e72e0e082f17
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index 351fe22bb..b8da6128a 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -60,12 +60,19 @@ use-build-blocker: true blocking-jobs: - 'xci-verify-{distro}-.*' + - 'xci-.*-{distro}-merge-.*' - 'bifrost-verify-{distro}-.*' - 'bifrost-periodic-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' - 'xci-(os|k8s).*?-virtual-{distro}-.*' block-level: 'NODE' + - throttle: + max-per-node: 2 + max-total: 10 + categories: + - xci-merge-virtual + option: category wrappers: - ssh-agent-wrapper diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 3c314568f..7c6871c22 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -66,6 +66,7 @@ use-build-blocker: true blocking-jobs: - 'xci-verify-{distro}-.*' + - 'xci-.*-{distro}-merge-.*' - 'bifrost-verify-{distro}-.*' - 'bifrost-periodic-{distro}-.*' - 'xci-osa-verify-{distro}-.*' |