diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-02-20 08:41:33 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-02-21 08:46:56 +0000 |
| commit | 14f326db6fb16680b6d5599f274c3d81892009f5 (patch) | |
| tree | dfc2d812c522e02a76878c55f739ecd63baff4b1 | |
| parent | f9a52671752efe3d4404343f5fafbeda6498464b (diff) | |
jjb: xci: Fix bifrost blockers for XCI jobs
The bifrost regexp was wrong leading to conflicts betwen the XCI
and bifrost jobs. Moreover, we need to add the same restrictions for
jobs/node on bifrost jobs similar to the XCI ones. This finally fixes
the 'throttle' property to use the 'xci-verify-virtual' category.
Change-Id: I6d3f8fdd82738c1d079b1a3fdef134753eb4281a
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | jjb/xci/bifrost-verify-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml index e4c2d0e5b..50b566bf4 100644 --- a/jjb/xci/bifrost-verify-jobs.yml +++ b/jjb/xci/bifrost-verify-jobs.yml @@ -71,7 +71,14 @@ use-build-blocker: true blocking-jobs: - 'xci-verify-{distro}-.*' + - 'xci-.*-{distro}-merge-.*' - '.*-bifrost-verify.*-{type}' + - throttle: + max-per-node: 2 + max-total: 10 + categories: + - xci-verify-virtual + option: category block-level: 'NODE' diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index b8da6128a..492348d63 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -61,8 +61,7 @@ blocking-jobs: - 'xci-verify-{distro}-.*' - 'xci-.*-{distro}-merge-.*' - - 'bifrost-verify-{distro}-.*' - - 'bifrost-periodic-{distro}-.*' + - 'openstack-bifrost-verify-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' - 'xci-(os|k8s).*?-virtual-{distro}-.*' @@ -71,7 +70,7 @@ max-per-node: 2 max-total: 10 categories: - - xci-merge-virtual + - xci-verify-virtual option: category wrappers: diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 7c6871c22..c6b6bc43b 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -67,8 +67,7 @@ blocking-jobs: - 'xci-verify-{distro}-.*' - 'xci-.*-{distro}-merge-.*' - - 'bifrost-verify-{distro}-.*' - - 'bifrost-periodic-{distro}-.*' + - 'openstack-bifrost-verify-{distro}-.*' - 'xci-osa-verify-{distro}-.*' - 'xci-osa-periodic-{distro}-.*' block-level: 'NODE' |