Hello community,
here is the log from the commit of package python-jenkins-job-builder for
openSUSE:Factory checked in at 2017-04-12 17:33: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"
Wed Apr 12 17:33:17 2017 rev:6 rq:482931 version:1.6.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jenkins-job-builder/python-jenkins-job-builder.changes
2017-03-17 15:07:21.490973979 +0100
+++
/work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new/python-jenkins-job-builder.changes
2017-04-12 18:19:54.538626644 +0200
@@ -1,0 +2,5 @@
+Wed Mar 22 11:49:09 GMT 2017 - [email protected]
+
+- Fix backport of patches for log parser plugin
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0002-Update-logparser-plugin.patch ++++++
--- /var/tmp/diff_new_pack.RDKqTR/_old 2017-04-12 18:19:55.714460374 +0200
+++ /var/tmp/diff_new_pack.RDKqTR/_new 2017-04-12 18:19:55.718459808 +0200
@@ -1,22 +1,23 @@
-From a07c886c89f1afca70642ca5280716523dc8cef9 Mon Sep 17 00:00:00 2001
+From 1b40d4aec9a1311c4ffa2b86d157df761e6686c0 Mon Sep 17 00:00:00 2001
From: Dong Ma <[email protected]>
Date: Wed, 28 Sep 2016 23:50:31 -0700
-Subject: [PATCH] Update logparser plugin
+Subject: [PATCH 1/2] Update logparser plugin docstring
-- update logparser plugin to user convert xml
-- update logparser docstring
+This is a partial backport, in order to keep the backport of
+d3307d6938edfa45470a454b2092fe25ec6870f2 as clean as possible.
-Change-Id: I13b36024bcaa3cfca2c8f2d3530bbc31dc9f52a8
+(cherry picked from commit a07c886c89f1afca70642ca5280716523dc8cef9)
+
+Change-Id: I0f9f9f1248051cc6de855b803154175009781787
---
- jenkins_jobs/modules/publishers.py | 18 ++++++++++--------
- tests/publishers/fixtures/logparser001.xml | 2 +-
- 2 files changed, 11 insertions(+), 9 deletions(-)
+ jenkins_jobs/modules/publishers.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jenkins_jobs/modules/publishers.py
b/jenkins_jobs/modules/publishers.py
-index 2a36c23..7ec9280 100644
+index ce2574d..47782da 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
-@@ -2146,9 +2146,10 @@ def logparser(registry, xml_parent, data):
+@@ -2076,9 +2076,10 @@ def logparser(parser, xml_parent, data):
"""yaml: logparser
Requires the Jenkins :jenkins-wiki:`Log Parser Plugin
<Log+Parser+Plugin>`.
@@ -29,39 +30,6 @@
Example:
-@@ -2158,12 +2159,13 @@ def logparser(registry, xml_parent, data):
-
- clog = XML.SubElement(xml_parent,
- 'hudson.plugins.logparser.LogParserPublisher')
-- XML.SubElement(clog, 'unstableOnWarning').text = \
-- str(data.get('unstable-on-warning', False)).lower()
-- XML.SubElement(clog, 'failBuildOnError').text = \
-- str(data.get('fail-on-error', False)).lower()
-- # v1.08: this must be the full path, the name of the rules is not enough
-- XML.SubElement(clog, 'parsingRulesPath').text = data.get('parse-rules',
'')
-+ clog.set('plugin', 'log-parser')
-+ mappings = [
-+ ('unstable-on-warning', 'unstableOnWarning', False),
-+ ('fail-on-error', 'failBuildOnError', False),
-+ ('parse-rules', 'parsingRulesPath', '')
-+ ]
-+ helpers.convert_mapping_to_xml(clog, data, mappings, fail_required=True)
-
-
- def copy_to_master(parser, xml_parent, data):
-diff --git a/tests/publishers/fixtures/logparser001.xml
b/tests/publishers/fixtures/logparser001.xml
-index 44881b7..15f3f8c 100644
---- a/tests/publishers/fixtures/logparser001.xml
-+++ b/tests/publishers/fixtures/logparser001.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <project>
- <publishers>
-- <hudson.plugins.logparser.LogParserPublisher>
-+ <hudson.plugins.logparser.LogParserPublisher plugin="log-parser">
- <unstableOnWarning>true</unstableOnWarning>
- <failBuildOnError>true</failBuildOnError>
- <parsingRulesPath>/path/to/parserules</parsingRulesPath>
--
2.1.2.330.g565301e
++++++ 0003-add-two-new-options-to-Log-Parser-Plugin.patch ++++++
--- /var/tmp/diff_new_pack.RDKqTR/_old 2017-04-12 18:19:55.734457546 +0200
+++ /var/tmp/diff_new_pack.RDKqTR/_new 2017-04-12 18:19:55.734457546 +0200
@@ -1,7 +1,7 @@
-From d3307d6938edfa45470a454b2092fe25ec6870f2 Mon Sep 17 00:00:00 2001
+From 6fbcb2856e1dc67671a4cd38abbd502e193ee0cf Mon Sep 17 00:00:00 2001
From: Adam Spiers <[email protected]>
Date: Tue, 14 Mar 2017 13:51:08 +0000
-Subject: [PATCH] add two new options to Log Parser Plugin
+Subject: [PATCH 2/2] add two new options to Log Parser Plugin
Support both global and per-project rules, and the showGraphs option,
both of which became possible in the 2.0 release:
@@ -10,16 +10,18 @@
https://github.com/jenkinsci/log-parser-plugin/commit/ecde717b9bc618c2d4c8b2526caf10655272148c
https://github.com/jenkinsci/log-parser-plugin/commit/6e75ecc8f9f82a17ec151c879dc37d882909df17
-Change-Id: I38b0058467d16ca7e3c4d3dc4edb2c9294551f15
+(backported from commit d3307d6938edfa45470a454b2092fe25ec6870f2)
+
+Change-Id: I1f75bc37706b0d7ce8dc2a9d6158a35dbc685a10
---
- jenkins_jobs/modules/publishers.py | 20 ++++++++++++++++++--
+ jenkins_jobs/modules/publishers.py | 22 ++++++++++++++++++++--
tests/publishers/fixtures/logparser-full.xml | 12 ++++++++++++
tests/publishers/fixtures/logparser-full.yaml | 7 +++++++
tests/publishers/fixtures/logparser-minimal.xml | 12 ++++++++++++
tests/publishers/fixtures/logparser-minimal.yaml | 3 +++
tests/publishers/fixtures/logparser001.xml | 10 ----------
tests/publishers/fixtures/logparser001.yaml | 5 -----
- 7 files changed, 52 insertions(+), 17 deletions(-)
+ 7 files changed, 54 insertions(+), 17 deletions(-)
create mode 100644 tests/publishers/fixtures/logparser-full.xml
create mode 100644 tests/publishers/fixtures/logparser-full.yaml
create mode 100644 tests/publishers/fixtures/logparser-minimal.xml
@@ -28,10 +30,10 @@
delete mode 100644 tests/publishers/fixtures/logparser001.yaml
diff --git a/jenkins_jobs/modules/publishers.py
b/jenkins_jobs/modules/publishers.py
-index 18e7e04..646007d 100644
+index 47782da..54f7c66 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
-@@ -2335,23 +2335,39 @@ def logparser(registry, xml_parent, data):
+@@ -2077,13 +2077,24 @@ def logparser(parser, xml_parent, data):
Requires the Jenkins :jenkins-wiki:`Log Parser Plugin
<Log+Parser+Plugin>`.
:arg str parse-rules: full path to parse rules (default '')
@@ -57,32 +59,32 @@
:language: yaml
"""
- clog = XML.SubElement(xml_parent,
- 'hudson.plugins.logparser.LogParserPublisher')
- clog.set('plugin', 'log-parser')
-+ rules_path_element = ("projectRulePath"
-+ if data.get("use-project-rules", True)
+@@ -2094,7 +2105,14 @@ def logparser(parser, xml_parent, data):
+ XML.SubElement(clog, 'failBuildOnError').text = \
+ str(data.get('fail-on-error', False)).lower()
+ # v1.08: this must be the full path, the name of the rules is not enough
+- XML.SubElement(clog, 'parsingRulesPath').text = data.get('parse-rules',
'')
++ use_project_rules = data.get("use-project-rules", True)
++ XML.SubElement(clog, 'showGraphs').text = \
++ str(data.get('show-graphs', True)).lower()
++ XML.SubElement(clog, 'useProjectRule').text = \
++ str(use_project_rules).lower()
++ rules_path_element = ("projectRulePath" if use_project_rules
+ else "parsingRulesPath")
- mappings = [
- ('unstable-on-warning', 'unstableOnWarning', False),
- ('fail-on-error', 'failBuildOnError', False),
-- ('parse-rules', 'parsingRulesPath', '')
-+ ('show-graphs', 'showGraphs', True),
-+ ('use-project-rules', 'useProjectRule', True),
-+ ('parse-rules', rules_path_element, ''),
- ]
- helpers.convert_mapping_to_xml(clog, data, mappings, fail_required=True)
++ XML.SubElement(clog, rules_path_element).text = data.get('parse-rules',
'')
+
+ def copy_to_master(parser, xml_parent, data):
diff --git a/tests/publishers/fixtures/logparser-full.xml
b/tests/publishers/fixtures/logparser-full.xml
new file mode 100644
-index 0000000..caac716
+index 0000000..652b478
--- /dev/null
+++ b/tests/publishers/fixtures/logparser-full.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <publishers>
-+ <hudson.plugins.logparser.LogParserPublisher plugin="log-parser">
++ <hudson.plugins.logparser.LogParserPublisher>
+ <unstableOnWarning>true</unstableOnWarning>
+ <failBuildOnError>true</failBuildOnError>
+ <showGraphs>false</showGraphs>
@@ -106,14 +108,14 @@
+ show-graphs: false
diff --git a/tests/publishers/fixtures/logparser-minimal.xml
b/tests/publishers/fixtures/logparser-minimal.xml
new file mode 100644
-index 0000000..681d63f
+index 0000000..67bc7bd
--- /dev/null
+++ b/tests/publishers/fixtures/logparser-minimal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <publishers>
-+ <hudson.plugins.logparser.LogParserPublisher plugin="log-parser">
++ <hudson.plugins.logparser.LogParserPublisher>
+ <unstableOnWarning>false</unstableOnWarning>
+ <failBuildOnError>false</failBuildOnError>
+ <showGraphs>true</showGraphs>
@@ -133,14 +135,14 @@
+ parse-rules: "project-log-parser-rules.txt"
diff --git a/tests/publishers/fixtures/logparser001.xml
b/tests/publishers/fixtures/logparser001.xml
deleted file mode 100644
-index 15f3f8c..0000000
+index 44881b7..0000000
--- a/tests/publishers/fixtures/logparser001.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project>
- <publishers>
-- <hudson.plugins.logparser.LogParserPublisher plugin="log-parser">
+- <hudson.plugins.logparser.LogParserPublisher>
- <unstableOnWarning>true</unstableOnWarning>
- <failBuildOnError>true</failBuildOnError>
- <parsingRulesPath>/path/to/parserules</parsingRulesPath>
