Apex: enable throttling for parallel jobs per node

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 8215b6e..ce673b2 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -212,12 +212,15 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-daily.*{stream1}'
                 - 'apex-deploy.*{stream1}'
                 - 'apex-build.*{stream1}'
                 - 'apex-runner.*{stream1}'
                 - 'apex-verify-{stream1}'
+        - throttle:
+            max-per-node: 1
 
     builders:
         - 'apex-build'
@@ -229,13 +232,13 @@
             git-revision: false
             block: true
             same-node: true
-        - trigger-builds:
-          - project: 'functest-apex-{slave}-suite-{stream1}'
-            predefined-parameters: |
-              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
-              FUNCTEST_SUITE_NAME=vping_userdata
-            block: true
-            same-node: true
+#        - trigger-builds:
+#          - project: 'functest-apex-{verify-slave}-suite-{stream1}'
+#            predefined-parameters: |
+#              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+#              FUNCTEST_SUITE_NAME=vping_userdata
+#            block: true
+#            same-node: true
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}'
             predefined-parameters: |
@@ -314,7 +317,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: '{slave}'
+    node: '{daily-slave}'
 
     disabled: false
 
@@ -339,8 +342,11 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
 
     builders:
         - 'apex-build'
@@ -350,6 +356,7 @@
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
             git-revision: false
+            same-node: true
             block: true
         - 'apex-upload-artifact'
 
@@ -388,8 +395,11 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
 
     builders:
         - 'apex-deploy-virtual'
@@ -605,6 +615,7 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*{stream1}'
                 - 'apex-deploy.*{stream1}'
@@ -619,6 +630,7 @@
           - project: 'apex-build-{stream1}'
             git-revision: true
             current-parameters: true
+            same-node: true
             block: true
         - trigger-builds:
           - project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'