Merge "compass: Align scenario short names"

[releng.git] / jjb / joid / joid-ci-jobs.yml

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 79262eb..12a49f3 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -35,6 +35,8 @@
             <<: *master
         - orange-pod2:
             <<: *master
+        - juniper-pod1:
+            <<: *master
 #--------------------------------
 # new scenario descriptions
     scenario:
@@ -67,10 +69,18 @@
 
     project-type: multijob
 
-    disabled: '{obj:disabled}'
-
     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'
@@ -113,10 +123,18 @@
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
 
-    disabled: false
-
     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'
@@ -170,3 +188,7 @@
     name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
+    triggers:
+        - timed: ''