From e7d7573b9bc086783b6067d5b394e4e1d4de5933 Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Thu, 30 Jun 2016 10:07:32 -0700 Subject: Add Project Option to Throttle Property This is a required field for JJB > 1.4 Change-Id: Ifb6f5d4b3a28f2d85f546151ca9aca4a4061f3ef Signed-off-by: Trevor Bramwell --- jjb/apex/apex.yml | 3 +++ jjb/armband/armband-ci-jobs.yml | 2 ++ jjb/armband/armband-project-jobs.yml | 1 + jjb/bottlenecks/bottlenecks-project-jobs.yml | 1 + jjb/compass4nfv/compass-ci-jobs.yml | 2 ++ jjb/compass4nfv/compass-project-jobs.yml | 4 ++++ jjb/cperf/cperf-ci-jobs.yml | 1 + jjb/fastpathmetrics/fastpathmetrics.yml | 2 ++ jjb/fuel/fuel-ci-jobs.yml | 2 ++ jjb/fuel/fuel-project-jobs.yml | 3 +++ jjb/functest/functest-ci-jobs.yml | 1 + jjb/joid/joid-ci-jobs.yml | 2 ++ jjb/vswitchperf/vswitchperf.yml | 2 ++ jjb/yardstick/yardstick-ci-jobs.yml | 1 + 14 files changed, 27 insertions(+) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 6c14a8107..ffd20bff0 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -226,6 +226,7 @@ - throttle: max-per-node: 1 max-total: 10 + option: 'project' builders: - 'apex-unit-test' @@ -356,6 +357,7 @@ - throttle: max-per-node: 1 max-total: 10 + option: 'project' builders: - 'apex-build' @@ -412,6 +414,7 @@ - throttle: max-per-node: 1 max-total: 10 + option: 'project' builders: - 'apex-deploy' diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 7d392414f..3d0db6587 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -58,6 +58,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -113,6 +114,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index aa089e0d5..732a9ea4d 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -71,6 +71,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index a28e2a407..ea000d8b9 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -114,6 +114,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 2ef25a749..4bbea4952 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -77,6 +77,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -146,6 +147,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index cb5b2e589..a0438ee1f 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -43,6 +43,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -116,6 +117,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -150,6 +152,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: @@ -191,6 +194,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml index f6a8acabb..d6c8601c6 100644 --- a/jjb/cperf/cperf-ci-jobs.yml +++ b/jjb/cperf/cperf-ci-jobs.yml @@ -45,6 +45,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' wrappers: - build-name: diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index db06afca4..ad1b601da 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -83,6 +83,7 @@ enabled: true max-total: 3 max-per-node: 2 + option: 'project' parameters: - project-parameter: @@ -134,6 +135,7 @@ enabled: true max-total: 3 max-per-node: 2 + option: 'project' parameters: - project-parameter: diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 8c7e72f25..e78be54b7 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -86,6 +86,7 @@ enabled: true max-total: 4 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -156,6 +157,7 @@ enabled: true max-total: 4 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 4e59c01d8..67343fb1b 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -38,6 +38,7 @@ enabled: true max-total: 1 max-per-node: 1 + option: 'project' parameters: - project-parameter: @@ -220,6 +221,7 @@ enabled: true max-total: 2 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -295,6 +297,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 27e1ee333..32251b8cb 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -151,6 +151,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' wrappers: - build-name: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 47159448e..6927ad99c 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -91,6 +91,7 @@ enabled: true max-total: 4 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: @@ -155,6 +156,7 @@ enabled: true max-total: 4 max-per-node: 1 + option: 'project' - build-blocker: use-build-blocker: true blocking-jobs: diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 0cf7f9786..bf2fe8faa 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -59,6 +59,7 @@ enabled: true max-total: 3 max-per-node: 2 + option: 'project' parameters: - project-parameter: @@ -116,6 +117,7 @@ enabled: true max-total: 3 max-per-node: 2 + option: 'project' parameters: - project-parameter: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 48c335a03..4f98e2c22 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -170,6 +170,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' wrappers: - build-name: -- cgit 1.2.3-korg