From: Fatih Degirmenci Date: Tue, 23 Jun 2020 21:54:58 +0000 (+0000) Subject: engine: Switch to build throttling X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;ds=inline;h=8795fc300b9be39db86562dd94d71c464e8005b3;p=infra%2Fcicd.git 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 7433d6e2..c4f6f75b 100644 --- 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 20bf2fcb..5f4e8011 100644 --- 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 d115415b..d679ed90 100644 --- 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 962d0fac..be28b970 100644 --- 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 3866c9a8..73a1e4d2 100644 --- 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 be17bf36..e4c9875f 100644 --- 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 5a06f363..9d32b986 100644 --- 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 2d8e7464..1e567624 100644 --- 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 2fa77b35..8d4979a9 100644 --- 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 409be753..62a3fddc 100644 --- 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 78937040..3e1e59b7 100644 --- 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 fb1fcf89..86912352 100644 --- 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: