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>

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index c4b7c8d..ef99f5a 100644 (file)
--- 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