Hello community,
here is the log from the commit of package python-jenkins-job-builder for
openSUSE:Factory checked in at 2018-09-11 17:17:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jenkins-job-builder (Old)
and /work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jenkins-job-builder"
Tue Sep 11 17:17:17 2018 rev:11 rq:634352 version:2.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jenkins-job-builder/python-jenkins-job-builder.changes
2018-09-07 15:39:49.002509573 +0200
+++
/work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new/python-jenkins-job-builder.changes
2018-09-11 17:17:32.803387171 +0200
@@ -1,0 +2,5 @@
+Fri Sep 7 12:34:09 UTC 2018 - [email protected]
+
+- add 0001-Use-upstream-default-for-allNodesMatchingLabel.patch
+
+-------------------------------------------------------------------
New:
----
0001-Use-upstream-default-for-allNodesMatchingLabel.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jenkins-job-builder.spec ++++++
--- /var/tmp/diff_new_pack.hmZhOL/_old 2018-09-11 17:17:34.535384512 +0200
+++ /var/tmp/diff_new_pack.hmZhOL/_new 2018-09-11 17:17:34.539384506 +0200
@@ -26,6 +26,8 @@
Group: Development/Languages/Python
Url: https://github.com/openstack-ci/jenkins-job-builder
Source:
https://files.pythonhosted.org/packages/source/j/jenkins-job-builder/jenkins-job-builder-%{version}.tar.gz
+# https://review.openstack.org/#/c/600715/
+Patch0: 0001-Use-upstream-default-for-allNodesMatchingLabel.patch
BuildRequires: %{python_module Jinja2}
BuildRequires: %{python_module fasteners}
BuildRequires: %{python_module mock}
@@ -56,6 +58,7 @@
%prep
%setup -q -n jenkins-job-builder-%{version}
+%patch0 -p1
%build
%python_build
++++++ 0001-Use-upstream-default-for-allNodesMatchingLabel.patch ++++++
>From 405df97718dda6710a9199d7fdb7d649efc9862d Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <[email protected]>
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 67a8c3f0..deb6eb0c 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 9157ccc6..0a5b9161 100644
--- a/tests/parameters/fixtures/node-label001.xml
+++ b/tests/parameters/fixtures/node-label001.xml
@@ -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>
diff --git a/tests/parameters/fixtures/node-label002.xml
b/tests/parameters/fixtures/node-label002.xml
index 4416dc8e..3ca6119e 100644
--- a/tests/parameters/fixtures/node-label002.xml
+++ b/tests/parameters/fixtures/node-label002.xml
@@ -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>
diff --git a/tests/parameters/fixtures/node-label003.xml
b/tests/parameters/fixtures/node-label003.xml
index 9a2b493d..3e4ad4e7 100644
--- a/tests/parameters/fixtures/node-label003.xml
+++ b/tests/parameters/fixtures/node-label003.xml
@@ -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>
diff --git a/tests/parameters/fixtures/node-label004.xml
b/tests/parameters/fixtures/node-label004.xml
index 788e2742..d1094633 100644
--- a/tests/parameters/fixtures/node-label004.xml
+++ b/tests/parameters/fixtures/node-label004.xml
@@ -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>
diff --git a/tests/parameters/fixtures/node-label006.xml
b/tests/parameters/fixtures/node-label006.xml
new file mode 100644
index 00000000..df8feb08
--- /dev/null
+++ b/tests/parameters/fixtures/node-label006.xml
@@ -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>
diff --git a/tests/parameters/fixtures/node-label006.yaml
b/tests/parameters/fixtures/node-label006.yaml
new file mode 100644
index 00000000..efbb107b
--- /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
--
2.18.0
