summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/sandbox/sandbox-verify-jobs-multijob.yml53
1 files changed, 36 insertions, 17 deletions
diff --git a/jjb/sandbox/sandbox-verify-jobs-multijob.yml b/jjb/sandbox/sandbox-verify-jobs-multijob.yml
index 7f7babb6d..6aa5d50f5 100644
--- a/jjb/sandbox/sandbox-verify-jobs-multijob.yml
+++ b/jjb/sandbox/sandbox-verify-jobs-multijob.yml
@@ -46,12 +46,18 @@
concurrent: true
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 2
+ max-per-node: 1
+ option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'sandbox-verify-master-multijob'
+ - 'sandbox-verify-colorado-multijob'
+ block-level: 'NODE'
scm:
- gerrit-trigger-scm:
@@ -90,6 +96,13 @@
pattern: 'docs/**|.gitignore'
readable-message: true
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - 'sandbox-virtual-defaults'
+
builders:
- description-setter:
description: "Built on $NODE_NAME"
@@ -130,6 +143,7 @@
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
- multijob:
@@ -143,6 +157,7 @@
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@ -151,6 +166,21 @@
disabled: '{obj:disabled}'
+ concurrent: true
+
+ properties:
+ - throttle:
+ enabled: true
+ max-total: 2
+ max-per-node: 1
+ option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'sandbox-verify-deploy-.*'
+ - 'sandbox-verify-test-.*'
+ block-level: 'NODE'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -164,17 +194,6 @@
- timeout:
timeout: 360
fail: true
-
- concurrent: true
-
- properties:
- - build-blocker:
- use-build-blocker: true
- blocking-jobs:
- - 'sandbox-verify-deploy-.*'
- - 'sandbox-verify-test-.*'
- block-level: 'NODE'
-
parameters:
- project-parameter:
project: '{project}'