Revert "Apex: fixes build directory passing for iso upload"

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

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index dd8af6a..d739a70 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -152,9 +152,8 @@
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -286,11 +285,9 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -429,7 +426,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -531,6 +528,8 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -665,7 +664,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -681,7 +680,7 @@
                   predefined-parameters: |
                     BUILD_DIRECTORY=apex-build-{{ stream }}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -766,7 +765,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -874,7 +872,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'