diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-27 09:29:38 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-05-27 09:35:38 -0400 |
| commit | 3cd4f6de57bd6d48f45a3d6d56c292e134e063b9 (patch) | |
| tree | 91e6084c25e33b4f00c3b594d41233a2c2b03931 | |
| parent | 36ba4f3b274b6330c3011e62b0710051a393a17f (diff) | |
Apex: fixes blocking per node with daily, verify
apex-verify-*: we dont need blocking on this, since it can run on any
node, and blocking is handled at lower layer jobs
apex-build-{stream}: needs to block if apex-verify-iso-{stream} is
running since apex-verify-iso will use the build directory of
apex-build-stream to get the ISO from in daily
apex-verify-iso does not need to block other deploys
Change-Id: Icf69d23b7aeaf73f5ebc7103db24e309ab0e949f
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex.yml | 24 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 24 |
2 files changed, 10 insertions, 38 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 05e9da8c6..bb49e4238 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -147,13 +147,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-daily.*' - - 'apex-deploy.*' - - 'apex-runner.*' - throttle: max-per-node: 3 max-total: 10 @@ -281,13 +274,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-daily.*' - - 'apex-deploy.*' - - 'apex-runner.*' - throttle: max-per-node: 3 max-total: 10 @@ -433,6 +419,11 @@ max-per-node: {concurrent-builds} max-total: 10 option: 'project' + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify-iso-{stream}' builders: - 'apex-build' @@ -471,11 +462,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 26d7b46f0..a95d9f433 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -147,13 +147,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-daily.*' - - 'apex-deploy.*' - - 'apex-runner.*' - throttle: max-per-node: 3 max-total: 10 @@ -281,13 +274,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-daily.*' - - 'apex-deploy.*' - - 'apex-runner.*' - throttle: max-per-node: 3 max-total: 10 @@ -433,6 +419,11 @@ max-per-node: {concurrent-builds} max-total: 10 option: 'project' + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify-iso-{stream}' builders: - 'apex-build' @@ -471,11 +462,6 @@ properties: - logrotate-default - - build-blocker: - use-build-blocker: true - block-level: 'NODE' - blocking-jobs: - - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 |