Hello community,
here is the log from the commit of package python-jenkins-job-builder for
openSUSE:Factory checked in at 2019-09-13 14:59:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jenkins-job-builder (Old)
and /work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jenkins-job-builder"
Fri Sep 13 14:59:35 2019 rev:19 rq:730188 version:3.0.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jenkins-job-builder/python-jenkins-job-builder.changes
2019-08-13 13:27:31.581319514 +0200
+++
/work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.7948/python-jenkins-job-builder.changes
2019-09-13 14:59:39.209280630 +0200
@@ -1,0 +2,9 @@
+Wed Sep 11 14:31:14 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 3.0.2:
+ * Added missing 'filters' parameters for rabbitmq trigger plugin
+ * Add support of "disableDeferredWipeout" option to workspace cleanup plugin
+ * Avoid ResourceWarning by closing file handlers when finished
+ * Add support for two new plugins, and a new version of one
+
+-------------------------------------------------------------------
Old:
----
jenkins-job-builder-3.0.1.tar.gz
New:
----
jenkins-job-builder-3.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jenkins-job-builder.spec ++++++
--- /var/tmp/diff_new_pack.VsNmT7/_old 2019-09-13 14:59:40.509280685 +0200
+++ /var/tmp/diff_new_pack.VsNmT7/_new 2019-09-13 14:59:40.513280685 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jenkins-job-builder
-Version: 3.0.1
+Version: 3.0.2
Release: 0
Summary: Program for configuring Jenkins jobs with YAML
License: Apache-2.0
++++++ jenkins-job-builder-3.0.1.tar.gz -> jenkins-job-builder-3.0.2.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/AUTHORS
new/jenkins-job-builder-3.0.2/AUTHORS
--- old/jenkins-job-builder-3.0.1/AUTHORS 2019-07-29 21:49:12.000000000
+0200
+++ new/jenkins-job-builder-3.0.2/AUTHORS 2019-08-15 21:08:43.000000000
+0200
@@ -1,3 +1,4 @@
+Achim Leitner <[email protected]>
Adam Harwell <[email protected]>
Adam Kaufman <[email protected]>
Adam Spiers <[email protected]>
@@ -271,7 +272,9 @@
Sebastian Schuberth <[email protected]>
Sergey Kolekonov <[email protected]>
Sergey Kulanov <[email protected]>
+Sergey Lebedev <[email protected]>
Sergey Yudin <[email protected]>
+Sergii Kipot <[email protected]>
Shane Wang <[email protected]>
Simon Gomizelj <[email protected]>
Simon Kuhnle <[email protected]>
@@ -321,6 +324,7 @@
Vishal Bhoj <[email protected]>
Vitaliy Lotorev <[email protected]>
Vitaliy Lotorev <[email protected]>
+Waldemar Znoinski <[email protected]>
Wayne <[email protected]>
Wayne Warren <[email protected]>
Wayne Warren <[email protected]>
@@ -340,6 +344,7 @@
hayderimran7 <[email protected]>
hayderimran7 <[email protected]>
imran <[email protected]>
+kendallpcdoctor <[email protected]>
liyuanzhen <[email protected]>
mhuin <[email protected]>
mlua <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/ChangeLog
new/jenkins-job-builder-3.0.2/ChangeLog
--- old/jenkins-job-builder-3.0.1/ChangeLog 2019-07-29 21:49:12.000000000
+0200
+++ new/jenkins-job-builder-3.0.2/ChangeLog 2019-08-15 21:08:43.000000000
+0200
@@ -1,10 +1,20 @@
CHANGES
=======
+3.0.2
+-----
+
+* Add support of "disableDeferredWipeout" option to workspace cleanup plugin
+* Fix encoding error in builder.py
+* Added missing 'filters' parameters for rabbitmq trigger plugin
+* add support for 'override-topic' in jms-messaging trigger
+
3.0.1
-----
* Revert "Add support for rendering jinja template as yaml"
+* Avoid ResourceWarning by closing file handlers when finished
+* Add support for two new plugins, and a new version of one
3.0.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/PKG-INFO
new/jenkins-job-builder-3.0.2/PKG-INFO
--- old/jenkins-job-builder-3.0.1/PKG-INFO 2019-07-29 21:49:13.000000000
+0200
+++ new/jenkins-job-builder-3.0.2/PKG-INFO 2019-08-15 21:08:44.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 3.0.1
+Version: 3.0.2
Summary: Manage Jenkins jobs with YAML
Home-page: https://docs.openstack.org/infra/jenkins-job-builder/
Author: OpenStack Infrastructure Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/PKG-INFO
new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/PKG-INFO
--- old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/PKG-INFO
2019-07-29 21:49:12.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/PKG-INFO
2019-08-15 21:08:43.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 3.0.1
+Version: 3.0.2
Summary: Manage Jenkins jobs with YAML
Home-page: https://docs.openstack.org/infra/jenkins-job-builder/
Author: OpenStack Infrastructure Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/SOURCES.txt
new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/SOURCES.txt
--- old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/SOURCES.txt
2019-07-29 21:49:13.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/SOURCES.txt
2019-08-15 21:08:43.000000000 +0200
@@ -527,6 +527,8 @@
tests/general/fixtures/folders002.yaml
tests/general/fixtures/jdk001.xml
tests/general/fixtures/jdk001.yaml
+tests/general/fixtures/matrix-axis-p4-strategy-file.xml
+tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
tests/general/fixtures/matrix-axis-yaml-strategy-file.xml
tests/general/fixtures/matrix-axis-yaml-strategy-file.yaml
tests/general/fixtures/matrix-axis-yaml-strategy-inlined.xml
@@ -844,6 +846,9 @@
tests/properties/fixtures/priority_sorter002.plugins_info.yaml
tests/properties/fixtures/priority_sorter002.xml
tests/properties/fixtures/priority_sorter002.yaml
+tests/properties/fixtures/priority_sorter003.plugins_info.yaml
+tests/properties/fixtures/priority_sorter003.xml
+tests/properties/fixtures/priority_sorter003.yaml
tests/properties/fixtures/promoted_build.xml
tests/properties/fixtures/promoted_build.yaml
tests/properties/fixtures/rebuild-full.xml
@@ -1123,6 +1128,10 @@
tests/publishers/fixtures/image-gallery002.yaml
tests/publishers/fixtures/image-gallery003.xml
tests/publishers/fixtures/image-gallery003.yaml
+tests/publishers/fixtures/influxdb-full.xml
+tests/publishers/fixtures/influxdb-full.yaml
+tests/publishers/fixtures/influxdb-minimal.xml
+tests/publishers/fixtures/influxdb-minimal.yaml
tests/publishers/fixtures/ircbot-full.xml
tests/publishers/fixtures/ircbot-full.yaml
tests/publishers/fixtures/ircbot-minimal.xml
@@ -1499,6 +1508,12 @@
tests/scm/fixtures/openshift-img-streams001.yaml
tests/scm/fixtures/openshift-img-streams002.xml
tests/scm/fixtures/openshift-img-streams002.yaml
+tests/scm/fixtures/p4-001.xml
+tests/scm/fixtures/p4-001.yaml
+tests/scm/fixtures/p4-002.xml
+tests/scm/fixtures/p4-002.yaml
+tests/scm/fixtures/p4-003.xml
+tests/scm/fixtures/p4-003.yaml
tests/scm/fixtures/raw001.xml
tests/scm/fixtures/raw001.yaml
tests/scm/fixtures/repo001.xml
@@ -1649,6 +1664,8 @@
tests/triggers/fixtures/pollscm004.yaml
tests/triggers/fixtures/pollurl001.xml
tests/triggers/fixtures/pollurl001.yaml
+tests/triggers/fixtures/rabbitmq-filters.xml
+tests/triggers/fixtures/rabbitmq-filters.yaml
tests/triggers/fixtures/rabbitmq.xml
tests/triggers/fixtures/rabbitmq.yaml
tests/triggers/fixtures/reverse-default.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/pbr.json
new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/pbr.json
--- old/jenkins-job-builder-3.0.1/jenkins_job_builder.egg-info/pbr.json
2019-07-29 21:49:12.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_job_builder.egg-info/pbr.json
2019-08-15 21:08:43.000000000 +0200
@@ -1 +1 @@
-{"git_version": "63c02a80", "is_release": true}
\ No newline at end of file
+{"git_version": "ead18513", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/jenkins_jobs/builder.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/builder.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/builder.py 2019-07-29
21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/builder.py 2019-08-15
21:07:32.000000000 +0200
@@ -181,7 +181,7 @@
def is_managed(self, job_name):
xml = self.jenkins.get_job_config(job_name)
try:
- out = XML.fromstring(xml)
+ out = XML.fromstring(xml.encode('utf-8'))
description = out.find(".//description").text
return description.endswith(MAGIC_MANAGE_STRING)
except (TypeError, AttributeError):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/jenkins_jobs/config.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/config.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/config.py 2019-07-29
21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/config.py 2019-08-15
21:07:38.000000000 +0200
@@ -141,6 +141,9 @@
self._setup()
self._handle_deprecated_hipchat_config()
+ if config_fp is not None:
+ config_fp.close()
+
def _init_defaults(self):
""" Initialize default configuration values using DEFAULT_CONF
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/project_matrix.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/project_matrix.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/project_matrix.py
2019-07-29 21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/project_matrix.py
2019-08-15 21:07:38.000000000 +0200
@@ -130,6 +130,8 @@
'hudson.matrix.DefaultMatrixExecutionStrategyImpl',
'yaml-strategy':
'org.jenkinsci.plugins.yamlaxis.YamlMatrixExecutionStrategy',
+ 'p4-strategy':
+ 'org.jenkinsci.plugins.p4.matrix.MatrixOptions'
}
def root_xml(self, data):
@@ -202,6 +204,15 @@
XML.SubElement(ex_r, 'excludeKey').text = exclude_key
+ elif strategy_name == 'p4-strategy':
+ XML.SubElement(ex_r, 'runSequentially').text = (
+ str(strategy.get('sequential', False)).lower()
+ )
+
+ XML.SubElement(ex_r, 'buildParent').text = (
+ str(strategy.get('build-parent', False)).lower()
+ )
+
ax_root = XML.SubElement(root, 'axes')
for axis_ in data.get('axes', []):
axis = axis_['axis']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/properties.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/properties.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/properties.py
2019-07-29 21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/properties.py
2019-08-15 21:07:38.000000000 +0200
@@ -580,7 +580,17 @@
plugin_info = registry.get_plugin_info('PrioritySorter')
version = pkg_resources.parse_version(plugin_info.get('version', '0'))
- if version >= pkg_resources.parse_version("2.0"):
+ if version >= pkg_resources.parse_version("3.0"):
+ priority_sorter_tag = XML.SubElement(
+ xml_parent,
+ 'jenkins.advancedqueue.jobinclusion.'
+ 'strategy.JobInclusionJobProperty')
+
+ mapping = [
+ ('use', 'useJobGroup', True),
+ ('priority', 'jobGroupName', None)
+ ]
+ elif version >= pkg_resources.parse_version("2.0"):
priority_sorter_tag = XML.SubElement(xml_parent,
'jenkins.advancedqueue.priority.'
'strategy.PriorityJobProperty')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/publishers.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/publishers.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/publishers.py
2019-07-29 21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/publishers.py
2019-08-15 21:07:38.000000000 +0200
@@ -40,6 +40,28 @@
import jenkins_jobs.modules.helpers as helpers
+def influx_db(registry, xml_parent, data):
+ """yaml: influx-db
+ Requires the Jenkins :jenkins-wiki: `Influx DB
+ <Influx+DB+Plugin>`.
+ """
+
+ influx_db = XML.SubElement(xml_parent,
+ 'jenkinsci.plugins.influxdb.InfluxDbPublisher',
+ {'plugin': 'influx-db'})
+
+ mapping = [
+ ('selected-target', 'selectedTarget', ''),
+ ('custom-project-name', 'customProjectName', ''),
+ ('custom-prefix', 'customPrefix', ''),
+ ('jenkins-env-parameter-field', 'jenkinsEnvParameterField', ''),
+ ('jenkins-env-parameter-tag', 'jenkinsEnvParameterTag', '')
+ ]
+
+ helpers.convert_mapping_to_xml(
+ influx_db, data, mapping, fail_required=True)
+
+
def allure(registry, xml_parent, data):
"""yaml: allure
@@ -3521,6 +3543,8 @@
:arg bool clean-parent: Cleanup matrix parent workspace (default false)
:arg str external-deletion-command: external deletion command to run
against files and directories
+ :arg bool disable-deferred-wipeout: Disable improved deferred wipeout
+ method (default false)
Minimal Example:
@@ -3554,7 +3578,8 @@
mappings = [
('dirmatch', 'deleteDirs', False),
('clean-parent', 'cleanupMatrixParent', False),
- ('external-deletion-command', 'externalDelete', '')
+ ('external-deletion-command', 'externalDelete', ''),
+ ('disable-deferred-wipeout', 'disableDeferredWipeout', False),
]
helpers.convert_mapping_to_xml(p, data, mappings, fail_required=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/scm.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/scm.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/scm.py 2019-07-29
21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/scm.py 2019-08-15
21:07:38.000000000 +0200
@@ -45,6 +45,115 @@
import jenkins_jobs.modules.helpers as helpers
+def p4(registry, xml_parent, data):
+ r"""yaml: p4
+ Specifies the Perforce (P4) repository for this job
+ Requires the Jenkins :jenkins-wiki:`P4 Plugin <P4+Plugin>`.
+ """
+ scm = XML.SubElement(xml_parent, 'scm',
+ {'class': 'org.jenkinsci.plugins.p4.PerforceScm',
+ 'plugin': 'p4'})
+
+ XML.SubElement(scm, 'credential').text = data.get('credential')
+
+ p4_construct_workspace(scm, data)
+
+ p4_construct_populate(scm, data)
+
+
+def p4_construct_workspace(xml_parent, data):
+ workspace = None
+
+ workspace_mapping = [
+ ('workspace-charset', 'charset', 'none'),
+ ('workspace-pin-host', 'pinHost', False),
+ ('workspace-name', 'name', ''),
+ ('workspace-cleanup', 'cleanup', None)
+ ]
+
+ if data.get('workspace-type') == 'Static':
+ workspace = XML.SubElement(xml_parent, 'workspace',
+ {'class':
+ 'org.jenkinsci.plugins.p4.workspace.StaticWorkspaceImpl'})
+ elif data.get('workspace-type') == 'Manual':
+ workspace = XML.SubElement(xml_parent, 'workspace',
+ {'class':
+ 'org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl'})
+
+ spec = XML.SubElement(workspace, 'spec')
+
+ spec_mapping = [
+ ('spec-allwrite', 'allwrite', False),
+ ('spec-clobber', 'clobber', False),
+ ('spec-compress', 'compress', False),
+ ('spec-locked', 'locked', False),
+ ('spec-modtime', 'modtime', False),
+ ('spec-rmdir', 'rmdir', False),
+ ('spec-line', 'line', ''),
+ ('spec-view', 'view', ''),
+ ('spec-type', 'type', ''),
+ ('spec-backup', 'backup', False),
+ ('spec-stream-name', 'streamName', '')
+ ]
+
+ helpers.convert_mapping_to_xml(
+ spec, data, spec_mapping, fail_required=False)
+
+ if 'view-mask' in data.keys():
+ filter_node = XML.SubElement(xml_parent, 'filter')
+
+ view_mask = XML.SubElement(filter_node,
+ 'org.jenkinsci.plugins.p4.filters.FilterViewMaskImpl')
+
+ view_mask_mapping = [
+ ('view-mask', 'viewMask', None)
+ ]
+
+ helpers.convert_mapping_to_xml(
+ view_mask, data, view_mask_mapping, fail_required=False)
+
+ helpers.convert_mapping_to_xml(
+ workspace, data, workspace_mapping, fail_required=False)
+
+
+def p4_construct_populate(xml_parent, data):
+ populate = None
+
+ populate_mapping = [
+ ('populate-have-list', 'have', False),
+ ('populate-force-sync', 'force', False),
+ ('populate-modtime', 'modtime', False),
+ ('populate-quiet', 'quiet', False),
+ ('populate-label', 'pin', None),
+ ('populate-revert', 'revert', None),
+ ('populate-replace', 'replace', None),
+ ('populate-delete', 'delete', None),
+ ('populate-tidy', 'tidy', None)
+ ]
+
+ parallel_mapping = [
+ ('parallel-enabled', 'enable', False),
+ ('parallel-threads', 'threads', '4'),
+ ('parallel-minfiles', 'minfiles', '1'),
+ ('parallel-minbytes', 'minbytes', '1024')
+ ]
+
+ if data.get('populate-type') == 'SyncOnly':
+ populate = XML.SubElement(xml_parent, 'populate',
+ {'class': 'org.jenkinsci.plugins.p4.populate.SyncOnlyImpl'})
+ elif data.get('populate-type') == 'AutoClean':
+ populate = XML.SubElement(xml_parent, 'populate',
+ {'class': 'org.jenkinsci.plugins.p4.populate.AutoCleanImpl'})
+
+ helpers.convert_mapping_to_xml(
+ populate, data, populate_mapping, fail_required=False)
+
+ parallel = XML.SubElement(populate, 'parallel')
+
+ helpers.convert_mapping_to_xml(
+ parallel, data, parallel_mapping, fail_required=False)
+
+
def git(registry, xml_parent, data):
r"""yaml: git
Specifies the git SCM repository for this job.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/triggers.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/triggers.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/triggers.py
2019-07-29 21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/triggers.py
2019-08-15 21:07:38.000000000 +0200
@@ -846,6 +846,8 @@
Requires the Jenkins :jenkins-wiki:`JMS Messaging Plugin
<JMS+Messaging+Plugin>`.
+ :arg str override-topic: If you need to override the default topic.
+ (default '')
:arg str selector: The JSON or YAML formatted text that conforms to
the schema for defining the various OpenShift resources. (default '')
note: topic needs to be in double quotes
@@ -873,6 +875,11 @@
jmsm = XML.SubElement(xml_parent,
namespace + 'CIBuildTrigger')
+ if 'override-topic' in data:
+ overrides = XML.SubElement(jmsm, 'overrides')
+ XML.SubElement(overrides,
+ 'topic').text = str(data['override-topic'])
+
mapping = [
# option, xml name, default value
("spec", 'spec', ''),
@@ -1915,17 +1922,40 @@
<RabbitMQ+Build+Trigger+Plugin>`.
:arg str token: the build token expected in the message queue (required)
+ :arg list filters: list of filters to apply (optional)
+
+ :Filter:
+ * **field** (`str`) - Some field in message (required)
+ * **value** (`str`) - value of specified field (required)
Example:
.. literalinclude:: /../../tests/triggers/fixtures/rabbitmq.yaml
:language: yaml
+
+ Example with filters:
+
+ .. literalinclude:: /../../tests/triggers/fixtures/rabbitmq-filters.yaml
+ :language: yaml
"""
+ rabbitmq_prefix = 'org.jenkinsci.plugins.rabbitmqbuildtrigger.'
rabbitmq = XML.SubElement(
xml_parent,
- 'org.jenkinsci.plugins.rabbitmqbuildtrigger.'
- 'RemoteBuildTrigger')
+ rabbitmq_prefix + 'RemoteBuildTrigger')
+ filters = data.get('filters', [])
+ filter_mapping = [
+ ('field', 'field', None),
+ ('value', 'value', None),
+ ]
+ if filters:
+ filters_tag = XML.SubElement(rabbitmq, 'filters')
+ for filter_data in filters:
+ filter_tag = XML.SubElement(
+ filters_tag,
+ rabbitmq_prefix + 'Filter')
+ helpers.convert_mapping_to_xml(
+ filter_tag, filter_data, filter_mapping, fail_required=True)
mapping = [
('', 'spec', ''),
('token', 'remoteBuildToken', None),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/wrappers.py
new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/wrappers.py
--- old/jenkins-job-builder-3.0.1/jenkins_jobs/modules/wrappers.py
2019-07-29 21:47:59.000000000 +0200
+++ new/jenkins-job-builder-3.0.2/jenkins_jobs/modules/wrappers.py
2019-08-15 21:07:38.000000000 +0200
@@ -767,6 +767,8 @@
determine whether to actually clean up
:arg str external-deletion-command: external deletion command to run
against files and directories
+ :arg bool disable-deferred-wipeout: Disable improved deferred wipeout
+ method (default false)
Full Example:
@@ -808,6 +810,7 @@
("dirmatch", 'deleteDirs', False),
('check-parameter', 'cleanupParameter', ''),
('external-deletion-command', 'externalDelete', ''),
+ ('disable-deferred-wipeout', 'disableDeferredWipeout', False),
]
helpers.convert_mapping_to_xml(p, data, mapping, fail_required=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-3.0.1/tests/base.py
new/jenkins-job-builder-3.0.2/tests/base.py
--- old/jenkins-job-builder-3.0.1/tests/base.py 2019-07-29 21:47:59.000000000
+0200
+++ new/jenkins-job-builder-3.0.2/tests/base.py 2019-08-15 21:07:38.000000000
+0200
@@ -137,7 +137,8 @@
# Read XML content, assuming it is unicode encoded
xml_content = ""
for f in sorted(self.out_filenames):
- xml_content += u"%s" % io.open(f, 'r', encoding='utf-8').read()
+ with io.open(f, 'r', encoding='utf-8') as xml_file:
+ xml_content += u"%s" % xml_file.read()
return xml_content
def _read_yaml_content(self, filename):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
new/jenkins-job-builder-3.0.2/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
---
old/jenkins-job-builder-3.0.1/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<matrix-project>
+ <executionStrategy class="org.jenkinsci.plugins.p4.matrix.MatrixOptions">
+ <runSequentially>false</runSequentially>
+ <buildParent>false</buildParent>
+ </executionStrategy>
+ <axes/>
+ <actions/>
+ <keepDependencies>false</keepDependencies>
+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <concurrentBuild>false</concurrentBuild>
+ <canRoam>true</canRoam>
+</matrix-project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
new/jenkins-job-builder-3.0.2/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
---
old/jenkins-job-builder-3.0.1/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,4 @@
+project-type: matrix
+p4-strategy:
+ sequential: false
+ build-parent: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
---
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,3 @@
+- longName: 'Jenkins Priority Sorter Plugin'
+ shortName: 'PrioritySorter'
+ version: '3.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.xml
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.xml
---
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.xml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <properties>
+ <jenkins.advancedqueue.jobinclusion.strategy.JobInclusionJobProperty>
+ <useJobGroup>true</useJobGroup>
+ <jobGroupName>Priority 3</jobGroupName>
+ </jenkins.advancedqueue.jobinclusion.strategy.JobInclusionJobProperty>
+ </properties>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.yaml
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.yaml
---
old/jenkins-job-builder-3.0.1/tests/properties/fixtures/priority_sorter003.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/properties/fixtures/priority_sorter003.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,3 @@
+properties:
+ - priority-sorter:
+ priority: Priority 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-full.xml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-full.xml
--- old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-full.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-full.xml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <publishers>
+ <jenkinsci.plugins.influxdb.InfluxDbPublisher plugin="influx-db">
+ <selectedTarget>selectedtarget</selectedTarget>
+ <customProjectName>customprojectname</customProjectName>
+ <customPrefix>customprefix</customPrefix>
+
<jenkinsEnvParameterField>jenkinsenvparameterfield</jenkinsEnvParameterField>
+ <jenkinsEnvParameterTag>jenkinsenvparametertag</jenkinsEnvParameterTag>
+ </jenkinsci.plugins.influxdb.InfluxDbPublisher>
+ </publishers>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-full.yaml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-full.yaml
--- old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-full.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-full.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,7 @@
+publishers:
+ - influx-db:
+ selected-target: selectedtarget
+ custom-project-name: customprojectname
+ custom-prefix: customprefix
+ jenkins-env-parameter-field: jenkinsenvparameterfield
+ jenkins-env-parameter-tag: jenkinsenvparametertag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-minimal.xml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-minimal.xml
---
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-minimal.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-minimal.xml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <publishers>
+ <jenkinsci.plugins.influxdb.InfluxDbPublisher plugin="influx-db">
+ <selectedTarget>selectedtarget</selectedTarget>
+ <customProjectName/>
+ <customPrefix/>
+ <jenkinsEnvParameterField/>
+ <jenkinsEnvParameterTag/>
+ </jenkinsci.plugins.influxdb.InfluxDbPublisher>
+ </publishers>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-minimal.yaml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-minimal.yaml
---
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/influxdb-minimal.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/influxdb-minimal.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,3 @@
+publishers:
+ - influx-db:
+ selected-target: selectedtarget
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-full.xml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-full.xml
---
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-full.xml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-full.xml
2019-08-15 21:07:38.000000000 +0200
@@ -15,6 +15,7 @@
<deleteDirs>true</deleteDirs>
<cleanupMatrixParent>true</cleanupMatrixParent>
<externalDelete>command</externalDelete>
+ <disableDeferredWipeout>true</disableDeferredWipeout>
<cleanWhenSuccess>false</cleanWhenSuccess>
<cleanWhenUnstable>false</cleanWhenUnstable>
<cleanWhenFailure>false</cleanWhenFailure>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-full.yaml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-full.yaml
---
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-full.yaml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-full.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -14,3 +14,4 @@
fail-build: false
clean-parent: true
external-deletion-command: 'command'
+ disable-deferred-wipeout: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-minimal.xml
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-minimal.xml
---
old/jenkins-job-builder-3.0.1/tests/publishers/fixtures/workspace-cleanup-minimal.xml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/publishers/fixtures/workspace-cleanup-minimal.xml
2019-08-15 21:07:38.000000000 +0200
@@ -5,6 +5,7 @@
<deleteDirs>false</deleteDirs>
<cleanupMatrixParent>false</cleanupMatrixParent>
<externalDelete/>
+ <disableDeferredWipeout>false</disableDeferredWipeout>
<cleanWhenSuccess>true</cleanWhenSuccess>
<cleanWhenUnstable>true</cleanWhenUnstable>
<cleanWhenFailure>true</cleanWhenFailure>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-001.xml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-001.xml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-001.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-001.xml 2019-08-15
21:07:38.000000000 +0200
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+ <credential>credential</credential>
+ <workspace class="org.jenkinsci.plugins.p4.workspace.StaticWorkspaceImpl">
+ <charset>none</charset>
+ <pinHost>false</pinHost>
+ <name>workspacename</name>
+ </workspace>
+ <populate class="org.jenkinsci.plugins.p4.populate.SyncOnlyImpl">
+ <have>true</have>
+ <force>false</force>
+ <modtime>false</modtime>
+ <quiet>true</quiet>
+ <pin>populatelabel</pin>
+ <revert>false</revert>
+ <parallel>
+ <enable>false</enable>
+ <threads>4</threads>
+ <minfiles>1</minfiles>
+ <minbytes>1024</minbytes>
+ </parallel>
+ </populate>
+ </scm>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-001.yaml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-001.yaml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-001.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-001.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,10 @@
+scm:
+ - p4:
+ credential: credential
+ workspace-type: Static
+ workspace-name: workspacename
+ populate-type: SyncOnly
+ populate-have-list: true
+ populate-quiet: true
+ populate-revert: false
+ populate-label: populatelabel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-002.xml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-002.xml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-002.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-002.xml 2019-08-15
21:07:38.000000000 +0200
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+ <credential>credential</credential>
+ <workspace class="org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl">
+ <spec>
+ <allwrite>true</allwrite>
+ <clobber>true</clobber>
+ <compress>true</compress>
+ <locked>true</locked>
+ <modtime>true</modtime>
+ <rmdir>true</rmdir>
+ <line>specline</line>
+ <view>specview</view>
+ <type>spectype</type>
+ <backup>true</backup>
+ <streamName>specstreamname</streamName>
+ </spec>
+ <charset>none</charset>
+ <pinHost>false</pinHost>
+ <name>workspacename</name>
+ </workspace>
+ <populate class="org.jenkinsci.plugins.p4.populate.AutoCleanImpl">
+ <have>true</have>
+ <force>false</force>
+ <modtime>false</modtime>
+ <quiet>true</quiet>
+ <pin>populatelabel</pin>
+ <revert>false</revert>
+ <parallel>
+ <enable>false</enable>
+ <threads>4</threads>
+ <minfiles>1</minfiles>
+ <minbytes>1024</minbytes>
+ </parallel>
+ </populate>
+ </scm>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-002.yaml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-002.yaml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-002.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-002.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,21 @@
+scm:
+ - p4:
+ credential: credential
+ workspace-type: Manual
+ workspace-name: workspacename
+ populate-type: AutoClean
+ populate-have-list: True
+ populate-quiet: True
+ populate-revert: False
+ populate-label: populatelabel
+ spec-allwrite: True
+ spec-clobber: True
+ spec-compress: True
+ spec-locked: True
+ spec-modtime: True
+ spec-rmdir: True
+ spec-line: specline
+ spec-view: specview
+ spec-type: spectype
+ spec-backup: True
+ spec-stream-name: specstreamname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-003.xml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-003.xml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-003.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-003.xml 2019-08-15
21:07:38.000000000 +0200
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+ <credential>credential</credential>
+ <workspace class="org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl">
+ <spec>
+ <allwrite>false</allwrite>
+ <clobber>false</clobber>
+ <compress>false</compress>
+ <locked>false</locked>
+ <modtime>false</modtime>
+ <rmdir>false</rmdir>
+ <line/>
+ <view/>
+ <type/>
+ <backup>false</backup>
+ <streamName/>
+ </spec>
+ <charset>none</charset>
+ <pinHost>false</pinHost>
+ <name>workspacename</name>
+ </workspace>
+ <filter>
+ <org.jenkinsci.plugins.p4.filters.FilterViewMaskImpl>
+ <viewMask>viewmask</viewMask>
+ </org.jenkinsci.plugins.p4.filters.FilterViewMaskImpl>
+ </filter>
+ <populate class="org.jenkinsci.plugins.p4.populate.SyncOnlyImpl">
+ <have>false</have>
+ <force>false</force>
+ <modtime>false</modtime>
+ <quiet>false</quiet>
+ <parallel>
+ <enable>true</enable>
+ <threads>2</threads>
+ <minfiles>5</minfiles>
+ <minbytes>500</minbytes>
+ </parallel>
+ </populate>
+ </scm>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-003.yaml
new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-003.yaml
--- old/jenkins-job-builder-3.0.1/tests/scm/fixtures/p4-003.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/scm/fixtures/p4-003.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,11 @@
+scm:
+ - p4:
+ credential: credential
+ workspace-type: Manual
+ workspace-name: workspacename
+ populate-type: SyncOnly
+ view-mask: viewmask
+ parallel-enabled: True
+ parallel-threads: 2
+ parallel-minfiles: 5
+ parallel-minbytes: 500
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/triggers/fixtures/rabbitmq-filters.xml
new/jenkins-job-builder-3.0.2/tests/triggers/fixtures/rabbitmq-filters.xml
--- old/jenkins-job-builder-3.0.1/tests/triggers/fixtures/rabbitmq-filters.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/triggers/fixtures/rabbitmq-filters.xml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <triggers class="vector">
+ <org.jenkinsci.plugins.rabbitmqbuildtrigger.RemoteBuildTrigger>
+ <filters>
+ <org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter>
+ <field>field1</field>
+ <value>value1</value>
+ </org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter>
+ <org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter>
+ <field>field2</field>
+ <value>value2</value>
+ </org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter>
+ </filters>
+ <spec/>
+ <remoteBuildToken>build_trigger_token</remoteBuildToken>
+ </org.jenkinsci.plugins.rabbitmqbuildtrigger.RemoteBuildTrigger>
+ </triggers>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/triggers/fixtures/rabbitmq-filters.yaml
new/jenkins-job-builder-3.0.2/tests/triggers/fixtures/rabbitmq-filters.yaml
--- old/jenkins-job-builder-3.0.1/tests/triggers/fixtures/rabbitmq-filters.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/jenkins-job-builder-3.0.2/tests/triggers/fixtures/rabbitmq-filters.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -0,0 +1,8 @@
+triggers:
+ - rabbitmq:
+ token: 'build_trigger_token'
+ filters:
+ - field: 'field1'
+ value: 'value1'
+ - field: 'field2'
+ value: 'value2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-full.xml
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-full.xml
---
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-full.xml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-full.xml
2019-08-15 21:07:38.000000000 +0200
@@ -15,6 +15,7 @@
<deleteDirs>true</deleteDirs>
<cleanupParameter>DO_WS_CLEANUP</cleanupParameter>
<externalDelete>shred -u %s</externalDelete>
+ <disableDeferredWipeout>true</disableDeferredWipeout>
</hudson.plugins.ws__cleanup.PreBuildCleanup>
</buildWrappers>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-full.yaml
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-full.yaml
---
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-full.yaml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-full.yaml
2019-08-15 21:07:38.000000000 +0200
@@ -7,3 +7,4 @@
dirmatch: true
check-parameter: "DO_WS_CLEANUP"
external-deletion-command: "shred -u %s"
+ disable-deferred-wipeout: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-min.xml
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-min.xml
---
old/jenkins-job-builder-3.0.1/tests/wrappers/fixtures/workspace-cleanup-min.xml
2019-07-29 21:47:59.000000000 +0200
+++
new/jenkins-job-builder-3.0.2/tests/wrappers/fixtures/workspace-cleanup-min.xml
2019-08-15 21:07:38.000000000 +0200
@@ -5,6 +5,7 @@
<deleteDirs>false</deleteDirs>
<cleanupParameter/>
<externalDelete/>
+ <disableDeferredWipeout>false</disableDeferredWipeout>
</hudson.plugins.ws__cleanup.PreBuildCleanup>
</buildWrappers>
</project>
