Remove Concurrency From JJB Merge Job

[releng.git] / jjb / releng / releng-ci-jobs.yml

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index d4f3970..ef99f5a 100644 (file)
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -5,7 +5,6 @@
       - 'releng-verify-jjb'
       - 'releng-merge-jjb'
       - 'releng-comment-jjb'
-      - 'releng-generate-artifacts-api'
 
     project: 'releng'
 
@@ -91,6 +90,12 @@
           project: '{project}'
           branch: 'master'
 
+    properties:
+      - throttle:
+          max-per-node: 1
+          max-total: 1
+          option: 'project'
+
     scm:
       - git-scm
 
@@ -119,22 +124,3 @@
               cd /opt/jenkins-ci/releng
               git pull
               jenkins-jobs update -r --delete-old jjb/
-
-- job-template:
-    name: 'releng-generate-artifacts-api'
-
-    # Generate and upload the JSON file to used for artifacts site
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: 'master'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '@hourly'
-
-    builders:
-      - build-and-upload-artifacts-json-api