From 405df97718dda6710a9199d7fdb7d649efc9862d Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 7 Sep 2018 13:07:58 +0200 Subject: [PATCH] Use upstream default for allNodesMatchingLabel As has been found earlier in Idf3460f165209611113193c7e85a884c42511371 having allNodesMatchingLabel on is a very bad idea because it kills scaling in your CI by scheduling every job on every node in parallel Change-Id: Iae07b578ccfb6f728a1615628479318c46e0530a --- jenkins_jobs/modules/parameters.py | 4 ++-- tests/parameters/fixtures/node-label001.xml | 2 +- tests/parameters/fixtures/node-label002.xml | 2 +- tests/parameters/fixtures/node-label003.xml | 2 +- tests/parameters/fixtures/node-label004.xml | 2 +- tests/parameters/fixtures/node-label006.xml | 17 +++++++++++++++++ tests/parameters/fixtures/node-label006.yaml | 5 +++++ 7 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 tests/parameters/fixtures/node-label006.xml create mode 100644 tests/parameters/fixtures/node-label006.yaml diff --git a/jenkins_jobs/modules/parameters.py b/jenkins_jobs/modules/parameters.py index 67a8c3f0a..deb6eb0ca 100644 --- a/jenkins_jobs/modules/parameters.py +++ b/jenkins_jobs/modules/parameters.py @@ -191,7 +191,7 @@ def label_param(registry, xml_parent, data): :arg str default: the default value of the parameter (optional) :arg str description: a description of the parameter (optional) :arg bool all-nodes: to run job on all nodes matching label - in parallel (default: true) + in parallel (default: false) :arg str matching-label: to run all nodes matching label 'success', 'unstable' or 'allCases' (optional) :arg str node-eligibility: all nodes, ignore temporary nodes or @@ -210,7 +210,7 @@ def label_param(registry, xml_parent, data): valid_types = ['allCases', 'success', 'unstable'] mapping = [ - ('all-nodes', 'allNodesMatchingLabel', True), + ('all-nodes', 'allNodesMatchingLabel', False), ('matching-label', 'triggerIfResult', 'allCases', valid_types), ] helpers.convert_mapping_to_xml(pdef, data, mapping, fail_required=True) diff --git a/tests/parameters/fixtures/node-label001.xml b/tests/parameters/fixtures/node-label001.xml index 9157ccc6b..0a5b91610 100644 --- a/tests/parameters/fixtures/node-label001.xml +++ b/tests/parameters/fixtures/node-label001.xml @@ -7,7 +7,7 @@ EXAMPLE LABEL 1 EXAMPLE LABEL DESCRIPTION 1 - true + false success diff --git a/tests/parameters/fixtures/node-label002.xml b/tests/parameters/fixtures/node-label002.xml index 4416dc8e1..3ca6119ea 100644 --- a/tests/parameters/fixtures/node-label002.xml +++ b/tests/parameters/fixtures/node-label002.xml @@ -7,7 +7,7 @@ EXAMPLE LABEL 2 EXAMPLE LABEL DESCRIPTION 2 - true + false unstable diff --git a/tests/parameters/fixtures/node-label003.xml b/tests/parameters/fixtures/node-label003.xml index 9a2b493df..3e4ad4e73 100644 --- a/tests/parameters/fixtures/node-label003.xml +++ b/tests/parameters/fixtures/node-label003.xml @@ -7,7 +7,7 @@ EXAMPLE LABEL 3 EXAMPLE LABEL DESCRIPTION 3 - true + false allCases diff --git a/tests/parameters/fixtures/node-label004.xml b/tests/parameters/fixtures/node-label004.xml index 788e27422..d1094633b 100644 --- a/tests/parameters/fixtures/node-label004.xml +++ b/tests/parameters/fixtures/node-label004.xml @@ -7,7 +7,7 @@ EXAMPLE LABEL 4 EXAMPLE LABEL DESCRIPTION 4 - true + false allCases diff --git a/tests/parameters/fixtures/node-label006.xml b/tests/parameters/fixtures/node-label006.xml new file mode 100644 index 000000000..df8feb081 --- /dev/null +++ b/tests/parameters/fixtures/node-label006.xml @@ -0,0 +1,17 @@ + + + + + + + EXAMPLE LABEL 6 + EXAMPLE LABEL DESCRIPTION 6 + + true + allCases + + + + + + diff --git a/tests/parameters/fixtures/node-label006.yaml b/tests/parameters/fixtures/node-label006.yaml new file mode 100644 index 000000000..efbb107b0 --- /dev/null +++ b/tests/parameters/fixtures/node-label006.yaml @@ -0,0 +1,5 @@ +parameters: + - label: + name: EXAMPLE LABEL 6 + description: "EXAMPLE LABEL DESCRIPTION 6" + all-nodes: true