summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-13 22:06:07 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-14 08:16:31 +0000
commit52035e5bd2487f998d2a59d0e44722654eb17f9e (patch)
tree03d0d766b517e626a1c5fb49cd3071487f06ea56
parent3a39911012324ee7b44f5c05edf3868da65bb489 (diff)
joid: Enable build blocker for CI jobs
Prevent starting more than 1 parent or deploy job on same pod. Fix the bug causing the jobs to be disabled. Change-Id: I515aa9977fc577b6ed95719668ef414ddf9b7fb0 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/joid/joid-ci-jobs.yml22
1 files changed, 21 insertions, 1 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 79262eb61..ff3aa2191 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -67,10 +67,20 @@
project-type: multijob
- disabled: '{obj:disabled}'
+ disabled: 'false'
concurrent: false
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 1
+ max-per-node: 1
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'joid-os-.*?-{pod}-daily-{stream}'
+
wrappers:
- build-name:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
@@ -117,6 +127,16 @@
concurrent: false
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 1
+ max-per-node: 1
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'joid-deploy-{pod}-daily-{stream}'
+
wrappers:
- build-name:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'