Hello community,
here is the log from the commit of package python-jenkins-job-builder for
openSUSE:Factory checked in at 2019-02-05 11:19:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jenkins-job-builder (Old)
and /work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jenkins-job-builder"
Tue Feb 5 11:19:00 2019 rev:14 rq:671249 version:2.9.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-jenkins-job-builder/python-jenkins-job-builder.changes
2018-11-30 16:33:45.337255410 +0100
+++
/work/SRC/openSUSE:Factory/.python-jenkins-job-builder.new.28833/python-jenkins-job-builder.changes
2019-02-05 11:19:01.664887007 +0100
@@ -1,0 +2,8 @@
+Tue Feb 5 05:01:51 UTC 2019 - Thomas Bechtold <[email protected]>
+
+- update to 2.9.1:
+ * Fix default '0' being ignored
+ * Convert parameter default value to str
+ * Adds support for Property Strategies
+
+-------------------------------------------------------------------
Old:
----
jenkins-job-builder-2.8.0.tar.gz
New:
----
jenkins-job-builder-2.9.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jenkins-job-builder.spec ++++++
--- /var/tmp/diff_new_pack.yLD1ny/_old 2019-02-05 11:19:02.128886752 +0100
+++ /var/tmp/diff_new_pack.yLD1ny/_new 2019-02-05 11:19:02.132886750 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-jenkins-job-builder
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 Thomas Bechtold <[email protected]>
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-jenkins-job-builder
-Version: 2.8.0
+Version: 2.9.1
Release: 0
Summary: Program for configuring Jenkins jobs with YAML
License: Apache-2.0
++++++ jenkins-job-builder-2.8.0.tar.gz -> jenkins-job-builder-2.9.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-2.8.0/ChangeLog
new/jenkins-job-builder-2.9.1/ChangeLog
--- old/jenkins-job-builder-2.8.0/ChangeLog 2018-11-19 03:02:01.000000000
+0100
+++ new/jenkins-job-builder-2.9.1/ChangeLog 2018-12-06 14:01:42.000000000
+0100
@@ -1,9 +1,21 @@
CHANGES
=======
+2.9.1
+-----
+
+* Fix default '0' being ignored
+
+2.9.0
+-----
+
+* Convert parameter default value to str
+* Adds support for Property Strategies
+
2.8.0
-----
+* Print config-xml warning once
* Handle cancel-builds-on-update values from vars
* Remove random print
* Add support for All view-type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-2.8.0/PKG-INFO
new/jenkins-job-builder-2.9.1/PKG-INFO
--- old/jenkins-job-builder-2.8.0/PKG-INFO 2018-11-19 03:02:02.000000000
+0100
+++ new/jenkins-job-builder-2.9.1/PKG-INFO 2018-12-06 14:01:43.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 2.8.0
+Version: 2.9.1
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-2.8.0/jenkins_job_builder.egg-info/PKG-INFO
new/jenkins-job-builder-2.9.1/jenkins_job_builder.egg-info/PKG-INFO
--- old/jenkins-job-builder-2.8.0/jenkins_job_builder.egg-info/PKG-INFO
2018-11-19 03:02:01.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_job_builder.egg-info/PKG-INFO
2018-12-06 14:01:42.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: jenkins-job-builder
-Version: 2.8.0
+Version: 2.9.1
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-2.8.0/jenkins_job_builder.egg-info/pbr.json
new/jenkins-job-builder-2.9.1/jenkins_job_builder.egg-info/pbr.json
--- old/jenkins-job-builder-2.8.0/jenkins_job_builder.egg-info/pbr.json
2018-11-19 03:02:01.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_job_builder.egg-info/pbr.json
2018-12-06 14:01:42.000000000 +0100
@@ -1 +1 @@
-{"git_version": "d29998e", "is_release": true}
\ No newline at end of file
+{"git_version": "02e8540", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jenkins-job-builder-2.8.0/jenkins_jobs/builder.py
new/jenkins-job-builder-2.9.1/jenkins_jobs/builder.py
--- old/jenkins-job-builder-2.8.0/jenkins_jobs/builder.py 2018-11-19
03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_jobs/builder.py 2018-12-06
13:59:45.000000000 +0100
@@ -79,14 +79,6 @@
output_dir = os.path.join(
output_dir, os.path.basename(item))
output_fn = os.path.join(output_dir, 'config.xml')
- else:
- logger.warn('(Deprecated) The default output behavior of'
- ' `jenkins-jobs test` when given the --output'
- ' flag will change in JJB 3.0.'
- ' Instead of writing jobs to OUTPUT/jobname;'
- ' they will be written to OUTPUT/jobname/config.xml.'
- ' The new behavior can be enabled by the passing'
- ' `--config-xml` parameter.')
if output_dir != output:
logger.debug("Creating directory %s" % output_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/jenkins_jobs/cli/subcommand/test.py
new/jenkins-job-builder-2.9.1/jenkins_jobs/cli/subcommand/test.py
--- old/jenkins-job-builder-2.8.0/jenkins_jobs/cli/subcommand/test.py
2018-11-19 03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_jobs/cli/subcommand/test.py
2018-12-06 13:59:45.000000000 +0100
@@ -50,6 +50,14 @@
help='path to output XML')
def execute(self, options, jjb_config):
+ if not options.config_xml:
+ logger.warn('(Deprecated) The default output behavior of'
+ ' `jenkins-jobs test` when given the --output'
+ ' flag will change in JJB 3.0.'
+ ' Instead of writing jobs to OUTPUT/jobname;'
+ ' they will be written to OUTPUT/jobname/config.xml.'
+ ' The new behavior can be enabled by the passing'
+ ' `--config-xml` parameter.')
builder, xml_jobs, xml_views = self._generate_xmljobs(
options, jjb_config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/jenkins_jobs/modules/parameters.py
new/jenkins-job-builder-2.9.1/jenkins_jobs/modules/parameters.py
--- old/jenkins-job-builder-2.8.0/jenkins_jobs/modules/parameters.py
2018-11-19 03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_jobs/modules/parameters.py
2018-12-06 13:59:45.000000000 +0100
@@ -47,8 +47,8 @@
XML.SubElement(pdef, 'description').text = data.get('description', '')
if do_default:
default = data.get('default', None)
- if default:
- XML.SubElement(pdef, 'defaultValue').text = default
+ if default is not None:
+ XML.SubElement(pdef, 'defaultValue').text = str(default)
else:
XML.SubElement(pdef, 'defaultValue')
return pdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/jenkins_jobs/modules/project_multibranch.py
new/jenkins-job-builder-2.9.1/jenkins_jobs/modules/project_multibranch.py
--- old/jenkins-job-builder-2.8.0/jenkins_jobs/modules/project_multibranch.py
2018-11-19 03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/jenkins_jobs/modules/project_multibranch.py
2018-12-06 13:59:45.000000000 +0100
@@ -325,6 +325,10 @@
discovered initially or a change from the previous revision has been
detected. (optional)
Refer to :func:`~build_strategies <build_strategies>`.
+ :arg dict property-strategies: Provides control over how to build a branch
+ (like to disable SCM triggering or to override the pipeline durability)
+ (optional)
+ Refer to :func:`~property_strategies <property_strategies>`.
:arg bool local-branch: Check out to matching local branch
If given, checkout the revision to build as HEAD on this branch.
If selected, then the branch name is computed from the remote branch
@@ -485,6 +489,9 @@
helpers.convert_mapping_to_xml(
dbr, data, dbr_mapping, fail_required=True)
+ if data.get('property-strategies', None):
+ property_strategies(xml_parent, data)
+
if data.get('build-strategies', None):
build_strategies(xml_parent, data)
@@ -564,6 +571,10 @@
discovered initially or a change from the previous revision has been
detected. (optional)
Refer to :func:`~build_strategies <build_strategies>`.
+ :arg dict property-strategies: Provides control over how to build a branch
+ (like to disable SCM triggering or to override the pipeline durability)
+ (optional)
+ Refer to :func:`~property_strategies <property_strategies>`.
Minimal Example:
@@ -621,6 +632,9 @@
'.RefSpecsSCMSourceTrait_-RefSpecTemplate'))
XML.SubElement(e, 'value').text = x
+ if data.get('property-strategies', None):
+ property_strategies(xml_parent, data)
+
if data.get('build-strategies', None):
build_strategies(xml_parent, data)
@@ -648,6 +662,10 @@
discovered initially or a change from the previous revision has been
detected. (optional)
Refer to :func:`~build_strategies <build_strategies>`.
+ :arg dict property-strategies: Provides control over how to build a branch
+ (like to disable SCM triggering or to override the pipeline durability)
+ (optional)
+ Refer to :func:`~property_strategies <property_strategies>`.
:extensions:
@@ -722,6 +740,9 @@
'jenkins.scm.impl.trait.RegexSCMHeadFilterTrait')
XML.SubElement(rshf, 'regex').text = data.get('head-filter-regex')
+ if data.get('property-strategies', None):
+ property_strategies(xml_parent, data)
+
if data.get('build-strategies', None):
build_strategies(xml_parent, data)
@@ -774,6 +795,10 @@
discovered initially or a change from the previous revision has been
detected. (optional)
Refer to :func:`~build_strategies <build_strategies>`.
+ :arg dict property-strategies: Provides control over how to build a branch
+ (like to disable SCM triggering or to override the pipeline durability)
+ (optional)
+ Refer to :func:`~property_strategies <property_strategies>`.
:extensions:
@@ -943,6 +968,9 @@
helpers.convert_mapping_to_xml(
dpro, data, dpro_mapping, fail_required=True)
+ if data.get('property-strategies', None):
+ property_strategies(xml_parent, data)
+
if data.get('build-strategies', None):
build_strategies(xml_parent, data)
@@ -1106,3 +1134,62 @@
nb['wildcards-name'],
wildcards_name_mapping,
fail_required=False)
+
+
+def property_strategies(xml_parent, data):
+ """Configure Basic Branch Property Strategies.
+
+ Requires the :jenkins-wiki:`Branch API Plugin <Branch+API+Plugin>`.
+
+ :arg dict property-strategies: Definition of property strategies.
+
+ * **all-branches** (list): A list of property strategy definitions
+ for use with all branches.
+
+ * **suppress-scm-triggering** (bool): Suppresses automatic SCM
+ triggering (optional)
+ * **pipeline-branch-durability-override** (str): Set a custom
+ branch speed/durability level. Valid values:
+ performance-optimized, survivable-nonatomic, or
+ max-survivability (optional) Requires the :jenkins-wiki:
+ `Pipeline Multibranch Plugin <Pipeline+Multibranch+Plugin>`
+ """
+
+ # Valid options for the pipeline branch durability override.
+ pbdo_map = collections.OrderedDict([
+ ("max-survivability", "MAX_SURVIVABILITY"),
+ ("performance-optimized", "PERFORMANCE_OPTIMIZED"),
+ ("survivable-nonatomic", "SURVIVABLE_NONATOMIC"),
+ ])
+ basic_property_strategies = 'jenkins.branch'
+ workflow_multibranch = 'org.jenkinsci.plugins.workflow.multibranch'
+ dbps = XML.SubElement(xml_parent, 'strategy', {
+ 'class': ''.join([basic_property_strategies,
+ '.DefaultBranchPropertyStrategy'])})
+ prop_strats = data.get('property-strategies', None)
+
+ if prop_strats:
+ props_elem = XML.SubElement(dbps, 'properties', {
+ 'class': 'java.util.Arrays$ArrayList'})
+ props_elem = XML.SubElement(props_elem, 'a', {
+ 'class': ''.join([
+ basic_property_strategies, '.BranchProperty-array'])})
+
+ for dbs_list in prop_strats.get('all-branches', None):
+
+ if dbs_list.get('suppress-scm-triggering', False):
+ XML.SubElement(props_elem, ''.join([
+ basic_property_strategies, '.NoTriggerBranchProperty']))
+
+ pbdo_val = dbs_list.get(
+ 'pipeline-branch-durability-override', None)
+ if pbdo_val:
+ if not pbdo_map.get(pbdo_val):
+ raise InvalidAttributeError(
+ 'pipeline-branch-durability-override',
+ pbdo_val,
+ pbdo_map.keys())
+ pbdo_elem = XML.SubElement(props_elem, ''.join([
+ workflow_multibranch, '.DurabilityHintBranchProperty']), {
+ 'plugin': 'workflow-multibranch'})
+ XML.SubElement(pbdo_elem, 'hint').text = pbdo_map.get(pbdo_val)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_bitbucket_full.xml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_bitbucket_full.xml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_bitbucket_full.xml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_bitbucket_full.xml
2018-12-06 13:59:45.000000000 +0100
@@ -104,6 +104,16 @@
</jenkins.plugins.git.traits.AuthorInChangelogTrait>
</traits>
</source>
+ <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
+ <properties class="java.util.Arrays$ArrayList">
+ <a class="jenkins.branch.BranchProperty-array">
+ <jenkins.branch.NoTriggerBranchProperty/>
+
<org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty
plugin="workflow-multibranch">
+ <hint>MAX_SURVIVABILITY</hint>
+
</org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty>
+ </a>
+ </properties>
+ </strategy>
<buildStrategies>
<jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl
plugin="basic-branch-build-strategies">
<atMostMillis>86400000</atMostMillis>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_bitbucket_full.yaml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_bitbucket_full.yaml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_bitbucket_full.yaml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_bitbucket_full.yaml
2018-12-06 13:59:45.000000000 +0100
@@ -19,6 +19,10 @@
filter-by-name-wildcard:
includes: '*'
excludes: 'master'
+ property-strategies:
+ all-branches:
+ - suppress-scm-triggering: true
+ - pipeline-branch-durability-override: max-survivability
build-strategies:
- tags:
ignore-tags-newer-than: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_gerrit_full.xml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_gerrit_full.xml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_gerrit_full.xml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_gerrit_full.xml
2018-12-06 13:59:45.000000000 +0100
@@ -49,6 +49,16 @@
</jenkins.plugins.git.traits.RefSpecsSCMSourceTrait>
</traits>
</source>
+ <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
+ <properties class="java.util.Arrays$ArrayList">
+ <a class="jenkins.branch.BranchProperty-array">
+ <jenkins.branch.NoTriggerBranchProperty/>
+
<org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty
plugin="workflow-multibranch">
+ <hint>MAX_SURVIVABILITY</hint>
+
</org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty>
+ </a>
+ </properties>
+ </strategy>
<buildStrategies>
<jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl
plugin="basic-branch-build-strategies">
<atMostMillis>86400000</atMostMillis>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_gerrit_full.yaml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_gerrit_full.yaml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_gerrit_full.yaml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_gerrit_full.yaml
2018-12-06 13:59:45.000000000 +0100
@@ -7,6 +7,10 @@
credentials-id: secret
ignore-on-push-notifications: true
refspecs: 'refs/heads/*'
+ property-strategies:
+ all-branches:
+ - suppress-scm-triggering: true
+ - pipeline-branch-durability-override: max-survivability
build-strategies:
- tags:
ignore-tags-newer-than: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_git_full.xml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_git_full.xml
--- old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_git_full.xml
2018-11-19 03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_git_full.xml
2018-12-06 13:59:45.000000000 +0100
@@ -81,6 +81,16 @@
</jenkins.plugins.git.traits.AuthorInChangelogTrait>
</traits>
</source>
+ <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
+ <properties class="java.util.Arrays$ArrayList">
+ <a class="jenkins.branch.BranchProperty-array">
+ <jenkins.branch.NoTriggerBranchProperty/>
+
<org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty
plugin="workflow-multibranch">
+ <hint>MAX_SURVIVABILITY</hint>
+
</org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty>
+ </a>
+ </properties>
+ </strategy>
<buildStrategies>
<jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl
plugin="basic-branch-build-strategies">
<atMostMillis>86400000</atMostMillis>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_git_full.yaml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_git_full.yaml
--- old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_git_full.yaml
2018-11-19 03:00:03.000000000 +0100
+++ new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_git_full.yaml
2018-12-06 13:59:45.000000000 +0100
@@ -9,6 +9,10 @@
ignore-on-push-notifications: true
discover-tags: true
head-filter-regex: 'master|\d+\.\d+'
+ property-strategies:
+ all-branches:
+ - suppress-scm-triggering: true
+ - pipeline-branch-durability-override: max-survivability
build-strategies:
- tags:
ignore-tags-newer-than: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_github_full.xml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_github_full.xml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_github_full.xml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_github_full.xml
2018-12-06 13:59:45.000000000 +0100
@@ -93,6 +93,16 @@
<com.adobe.jenkins.disable__github__multibranch__status.DisableStatusUpdateTrait
plugin="disable-github-multibranch-status"/>
</traits>
</source>
+ <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
+ <properties class="java.util.Arrays$ArrayList">
+ <a class="jenkins.branch.BranchProperty-array">
+ <jenkins.branch.NoTriggerBranchProperty/>
+
<org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty
plugin="workflow-multibranch">
+ <hint>MAX_SURVIVABILITY</hint>
+
</org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty>
+ </a>
+ </properties>
+ </strategy>
<buildStrategies>
<jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl
plugin="basic-branch-build-strategies">
<atMostMillis>86400000</atMostMillis>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_github_full.yaml
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_github_full.yaml
---
old/jenkins-job-builder-2.8.0/tests/multibranch/fixtures/scm_github_full.yaml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/multibranch/fixtures/scm_github_full.yaml
2018-12-06 13:59:45.000000000 +0100
@@ -14,6 +14,10 @@
discover-pr-forks-trust: everyone
discover-pr-origin: both
discover-tags: true
+ property-strategies:
+ all-branches:
+ - suppress-scm-triggering: true
+ - pipeline-branch-durability-override: max-survivability
build-strategies:
- tags:
ignore-tags-newer-than: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/yamlparser/fixtures/variable_default_values.xml
new/jenkins-job-builder-2.9.1/tests/yamlparser/fixtures/variable_default_values.xml
---
old/jenkins-job-builder-2.8.0/tests/yamlparser/fixtures/variable_default_values.xml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/yamlparser/fixtures/variable_default_values.xml
2018-12-06 13:59:45.000000000 +0100
@@ -8,6 +8,56 @@
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
<properties>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>INT_DEFAULT</name>
+ <description/>
+ <defaultValue>0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ </properties>
+ <scm class="hudson.scm.NullSCM"/>
+ <builders/>
+ <publishers/>
+ <buildWrappers/>
+</project>
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <actions/>
+ <description><!-- Managed by Jenkins Job Builder --></description>
+ <keepDependencies>false</keepDependencies>
+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <concurrentBuild>false</concurrentBuild>
+ <canRoam>true</canRoam>
+ <properties>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>INT_DEFAULT</name>
+ <description/>
+ <defaultValue>1</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ </properties>
+ <scm class="hudson.scm.NullSCM"/>
+ <builders/>
+ <publishers/>
+ <buildWrappers/>
+</project>
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+ <actions/>
+ <description><!-- Managed by Jenkins Job Builder --></description>
+ <keepDependencies>false</keepDependencies>
+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <concurrentBuild>false</concurrentBuild>
+ <canRoam>true</canRoam>
+ <properties>
<jenkins.model.BuildDiscarderProperty>
<strategy class="hudson.tasks.LogRotator">
<daysToKeep>+1</daysToKeep>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jenkins-job-builder-2.8.0/tests/yamlparser/fixtures/variable_default_values.yaml
new/jenkins-job-builder-2.9.1/tests/yamlparser/fixtures/variable_default_values.yaml
---
old/jenkins-job-builder-2.8.0/tests/yamlparser/fixtures/variable_default_values.yaml
2018-11-19 03:00:03.000000000 +0100
+++
new/jenkins-job-builder-2.9.1/tests/yamlparser/fixtures/variable_default_values.yaml
2018-12-06 13:59:45.000000000 +0100
@@ -3,6 +3,10 @@
jobs:
- 'variable_default_values':
defined_var: '7'
+ - 'test_int_default_{int}':
+ int: 0
+ - 'test_int_default_{int}':
+ int: 1
- job-template:
name: 'variable_default_values'
@@ -18,3 +22,10 @@
echo "{{defined_var|-1}}"
echo "{{undefined_var|+1}}"
echo "{{undefined_var|-1}}"
+
+- job-template:
+ name: 'test_int_default_{int}'
+ parameters:
+ - string:
+ name: INT_DEFAULT
+ default: '{int}'
