engine: Switch to build throttling

Change-Id: Iee372ae89a12bdf6a00068fe53a8515e4de7b07a

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index 7433d6e2b5c2088002ebcfb8e4c32f8e04c98c1b..c4f6f75b0d7d6cc82b2e31f244457f317713f36c 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -156,18 +156,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-online-deploy-test-.*'
-            - 'kubernetes-verify-offline-deploy-test-.*'
-            - 'onap-verify-offline-deploy-test-.*'
-            - 'openstack-verify-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
index 20bf2fcbcc8bb36f614808e389e4dcc3e757cc81..5f4e80118736e72781ba861d81847cfe50f4554d 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-package.yaml
@@ -78,18 +78,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-            - 'openstack-verify-package-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/engine-verify-tox.yaml b/jjb/engine/verify-jobs/engine-verify-tox.yaml
index d115415ba90bee42281d34359f9fdc851d77a9c8..d679ed9069f72c3d84af85a7e4544f733e03a7bc 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-tox.yaml
@@ -67,6 +67,14 @@
 
     properties:
       - logrotate
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-tox
 
     wrappers:
       - build-timeout:

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
index 962d0fac4d42a68c62c8ccc29636bd5baa669ebe..be28b970df4c643df126afd8c0d0d2b2e9543961 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-deploy-test.yaml
@@ -163,18 +163,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-online-deploy-test-.*'
-            - 'kubernetes-verify-offline-deploy-test-.*'
-            - 'onap-verify-offline-deploy-test-.*'
-            - 'openstack-verify-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
index 3866c9a83cb6cf45b697db59ca6d022c96eab8f6..73a1e4d22aaa75930801aa8a7b091ca4a4cf5746 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-package.yaml
@@ -99,18 +99,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-            - 'openstack-verify-package-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
index be17bf36cfab3700d82352cb8d2d6d6b3e0f9020..e4c9875fe2407dd7dd86b4461abfa62f1fdc3970 100644 (file)
--- a/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/kubernetes-verify-tox.yaml
@@ -73,6 +73,14 @@
 
     properties:
       - logrotate
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-tox
 
     wrappers:
       - build-timeout:

diff --git a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
index 5a06f36339b0c1e5aaac046142be81936b17b9dc..9d32b986829be9a492aa42382187fcc69f7700db 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-deploy-test.yaml
@@ -154,18 +154,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-online-deploy-test-.*'
-            - 'kubernetes-verify-offline-deploy-test-.*'
-            - 'onap-verify-offline-deploy-test-.*'
-            - 'openstack-verify-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/onap-verify-package.yaml b/jjb/engine/verify-jobs/onap-verify-package.yaml
index 2d8e746457de3f2413191d20a4b413ec3e41f347..1e5676246e73587da0b3f5dfbbdc21f5e5165b45 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-package.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-package.yaml
@@ -96,18 +96,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-            - 'openstack-verify-package-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/onap-verify-tox.yaml b/jjb/engine/verify-jobs/onap-verify-tox.yaml
index 2fa77b3549f61cb850358ee79cd76f0be0a64745..8d4979a97327fd287a5d542a35716e92301dc924 100644 (file)
--- a/jjb/engine/verify-jobs/onap-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/onap-verify-tox.yaml
@@ -70,6 +70,14 @@
 
     properties:
       - logrotate
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-tox
 
     wrappers:
       - build-timeout:

diff --git a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
index 409be753691ebc5efc6f07e15aaaad6a12c30455..62a3fddc28d30a4cddbe09e996cc4fda98f33447 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-deploy-test.yaml
@@ -154,18 +154,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-online-deploy-test-.*'
-            - 'kubernetes-verify-offline-deploy-test-.*'
-            - 'onap-verify-offline-deploy-test-.*'
-            - 'openstack-verify-offline-deploy-test-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 8
+          option: category
+          categories:
+            - engine-verify-deploy-test
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/openstack-verify-package.yaml b/jjb/engine/verify-jobs/openstack-verify-package.yaml
index 789370404994db9383d8f4b5e2ebcefc212af0e0..3e1e59b7bbcb7c1c12ca0334ec42c00102455cc3 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-package.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-package.yaml
@@ -96,18 +96,14 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-package-.*'
-            - 'kubernetes-verify-package-.*'
-            - 'onap-verify-package-.*'
-            - 'openstack-verify-package-.*'
-          block-level: 'NODE'
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
       - throttle:
+          enabled: true
           max-per-node: 1
-          max-total: 3
-          option: project
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-package
 
     scm:
       - git-scm-gerrit:

diff --git a/jjb/engine/verify-jobs/openstack-verify-tox.yaml b/jjb/engine/verify-jobs/openstack-verify-tox.yaml
index fb1fcf89757f2a08295158655ed012a3d025157f..8691235250720a73bea3262b0e57118366eb29ad 100644 (file)
--- a/jjb/engine/verify-jobs/openstack-verify-tox.yaml
+++ b/jjb/engine/verify-jobs/openstack-verify-tox.yaml
@@ -70,6 +70,14 @@
 
     properties:
       - logrotate
+      # NOTE (fdegir): throttle categories are controlled in jenkins global configuration
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          max-total: 4
+          option: category
+          categories:
+            - engine-verify-tox
 
     wrappers:
       - build-timeout: