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
This commit is contained in:
parent
4d5397c496
commit
405df97718
@ -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)
|
||||
|
@ -7,7 +7,7 @@
|
||||
<name>EXAMPLE LABEL 1</name>
|
||||
<description>EXAMPLE LABEL DESCRIPTION 1</description>
|
||||
<defaultValue/>
|
||||
<allNodesMatchingLabel>true</allNodesMatchingLabel>
|
||||
<allNodesMatchingLabel>false</allNodesMatchingLabel>
|
||||
<triggerIfResult>success</triggerIfResult>
|
||||
<nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
|
||||
</org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<name>EXAMPLE LABEL 2</name>
|
||||
<description>EXAMPLE LABEL DESCRIPTION 2</description>
|
||||
<defaultValue/>
|
||||
<allNodesMatchingLabel>true</allNodesMatchingLabel>
|
||||
<allNodesMatchingLabel>false</allNodesMatchingLabel>
|
||||
<triggerIfResult>unstable</triggerIfResult>
|
||||
<nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.IgnoreOfflineNodeEligibility"/>
|
||||
</org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<name>EXAMPLE LABEL 3</name>
|
||||
<description>EXAMPLE LABEL DESCRIPTION 3</description>
|
||||
<defaultValue/>
|
||||
<allNodesMatchingLabel>true</allNodesMatchingLabel>
|
||||
<allNodesMatchingLabel>false</allNodesMatchingLabel>
|
||||
<triggerIfResult>allCases</triggerIfResult>
|
||||
<nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.IgnoreTempOfflineNodeEligibility"/>
|
||||
</org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<name>EXAMPLE LABEL 4</name>
|
||||
<description>EXAMPLE LABEL DESCRIPTION 4</description>
|
||||
<defaultValue/>
|
||||
<allNodesMatchingLabel>true</allNodesMatchingLabel>
|
||||
<allNodesMatchingLabel>false</allNodesMatchingLabel>
|
||||
<triggerIfResult>allCases</triggerIfResult>
|
||||
<nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
|
||||
</org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
|
17
tests/parameters/fixtures/node-label006.xml
Normal file
17
tests/parameters/fixtures/node-label006.xml
Normal file
@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<project>
|
||||
<properties>
|
||||
<hudson.model.ParametersDefinitionProperty>
|
||||
<parameterDefinitions>
|
||||
<org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
<name>EXAMPLE LABEL 6</name>
|
||||
<description>EXAMPLE LABEL DESCRIPTION 6</description>
|
||||
<defaultValue/>
|
||||
<allNodesMatchingLabel>true</allNodesMatchingLabel>
|
||||
<triggerIfResult>allCases</triggerIfResult>
|
||||
<nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
|
||||
</org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition>
|
||||
</parameterDefinitions>
|
||||
</hudson.model.ParametersDefinitionProperty>
|
||||
</properties>
|
||||
</project>
|
5
tests/parameters/fixtures/node-label006.yaml
Normal file
5
tests/parameters/fixtures/node-label006.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
parameters:
|
||||
- label:
|
||||
name: EXAMPLE LABEL 6
|
||||
description: "EXAMPLE LABEL DESCRIPTION 6"
|
||||
all-nodes: true
|
Loading…
x
Reference in New Issue
Block a user