From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 13 Jan 2016 21:06:07 +0000 (+0100)
Subject: joid: Enable build blocker for CI jobs
X-Git-Tag: brahmaputra.1.0~221
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=52035e5bd2487f998d2a59d0e44722654eb17f9e;p=releng.git

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>
---

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'