summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2017-11-02 16:06:09 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-01-12 18:37:08 +0000
commitc4f48069d9a85957e78f45a62b1d6d6fcf34c467 (patch)
tree2ad54139d6b1fc1e2e865df5a63cd682cbdd5ece /jjb
parent7c32b1ffb5c6cc7b02559d0fc31ce33fc4b0169a (diff)
Remove Concurrency From JJB Merge Job
Currently multiple jjb merge jobs can run at once causing a race-condition which Jenkins exposes as a 401 Unauthorized. Throttling the number of jobs in total to 1 should prevent this from happening in the future. Change-Id: I4c99d9f49db0baf26b3d077354afd2fea93d1740 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng/releng-ci-jobs.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index c4b7c8db3..ef99f5abb 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -90,6 +90,12 @@
project: '{project}'
branch: 'master'
+ properties:
+ - throttle:
+ max-per-node: 1
+ max-total: 1
+ option: 'project'
+
scm:
- git-scm