Merge "Functest: Sets max concurrent jobs to 10"

[releng.git] / jjb / apex / apex-verify-jobs.yaml

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index f808793..854aefc 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -12,6 +12,11 @@
           gs-pathname: ''
           verify-scenario: 'os-nosdn-nofeature-noha'
           disabled: false
+      - gambia: &gambia
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          verify-scenario: 'os-nosdn-nofeature-ha'
+          disabled: false
       - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
@@ -194,7 +199,11 @@
           max-per-node: 3
           max-total: 10
           option: 'project'
-
+      - build-blocker:
+          use-build-blocker: true
+          blocking-level: 'NODE'
+          blocking-jobs:
+            - 'apex-.*-promote.*'
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
@@ -245,7 +254,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                 FUNCTEST_SUITE_NAME=tempest_smoke
                 FUNCTEST_MODE=testcase
-              node-parameters: false
+              node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
@@ -307,7 +316,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-virtual.*'