diff options
| -rw-r--r-- | doc/source/definition.rst | 4 | ||||
| -rw-r--r-- | jenkins_jobs/modules/project_pipeline.py | 4 | ||||
| -rw-r--r-- | jenkins_jobs/modules/project_workflow.py | 2 | ||||
| -rwxr-xr-x | jenkins_jobs/modules/publishers.py | 2 | ||||
| -rw-r--r-- | jenkins_jobs/modules/wrappers.py | 10 |
5 files changed, 11 insertions, 11 deletions
diff --git a/doc/source/definition.rst b/doc/source/definition.rst index 6e63f83d..978d620b 100644 --- a/doc/source/definition.rst +++ b/doc/source/definition.rst @@ -577,7 +577,7 @@ and replace them with the empty string instead. Refer to :ref:`default-values` for details on setting variable defaults. -Variable Inheritence +Variable Inheritance ^^^^^^^^^^^^^^^^^^^^ It is possible in JJB to define defaults for variables at different levels such @@ -624,7 +624,7 @@ When a project wants to use a job-template it can use override it as follows: This is the standard way that most folks use and it will set ``branch: master`` for every job-template in the list. However sometimes we may want to provide an alternative value for a specific job in the list. In this case the more -specific declaration takes precendence: +specific declaration takes precedence: .. code-block:: yaml diff --git a/jenkins_jobs/modules/project_pipeline.py b/jenkins_jobs/modules/project_pipeline.py index 518ba2c9..15c39cb4 100644 --- a/jenkins_jobs/modules/project_pipeline.py +++ b/jenkins_jobs/modules/project_pipeline.py @@ -93,8 +93,8 @@ class Pipeline(jenkins_jobs.modules.base.Base): xml_parent, "definition", { - "plugin": "workflow-cps", "class": "org.jenkinsci.plugins." "workflow.cps.CpsFlowDefinition", + "plugin": "workflow-cps", }, ) XML.SubElement(xml_definition, "script").text = data["dsl"] @@ -103,9 +103,9 @@ class Pipeline(jenkins_jobs.modules.base.Base): xml_parent, "definition", { - "plugin": "workflow-cps", "class": "org.jenkinsci.plugins.workflow.cps." "CpsScmFlowDefinition", + "plugin": "workflow-cps", }, ) else: diff --git a/jenkins_jobs/modules/project_workflow.py b/jenkins_jobs/modules/project_workflow.py index 35cd93b5..994e89c8 100644 --- a/jenkins_jobs/modules/project_workflow.py +++ b/jenkins_jobs/modules/project_workflow.py @@ -66,8 +66,8 @@ class Workflow(jenkins_jobs.modules.base.Base): xml_parent, "definition", { - "plugin": "workflow-cps", "class": "org.jenkinsci.plugins." "workflow.cps.CpsFlowDefinition", + "plugin": "workflow-cps", }, ) diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index a83bec09..9205cde0 100755 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -7451,7 +7451,7 @@ def slack(registry, xml_parent, data): (>=2.0). (default false) :arg bool notify-failure: Send notification when job fails for the first time (previous build was a success) (>=2.0). (default false) - :arg bool notify-every-failure: Send notification everytime a job fails + :arg bool notify-every-failure: Send notification every time a job fails (>=2.23). (default false) :arg bool notify-back-to-normal: Send notification when job is succeeding again after being unstable or failed (>=2.0). (default false) diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index c4a3ce45..77230c8e 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -1003,7 +1003,7 @@ def rbenv(registry, xml_parent, data): ro_class = "Jenkins::Tasks::BuildWrapperProxy" ro = XML.SubElement( - rpo, "ruby-object", {"ruby-class": ro_class, "pluginid": "rbenv"} + rpo, "ruby-object", {"pluginid": "rbenv", "ruby-class": ro_class} ) XML.SubElement( @@ -1011,7 +1011,7 @@ def rbenv(registry, xml_parent, data): ).text = "rbenv" o = XML.SubElement( - ro, "object", {"ruby-class": "RbenvWrapper", "pluginid": "rbenv"} + ro, "object", {"pluginid": "rbenv", "ruby-class": "RbenvWrapper"} ) mapping = [ @@ -1033,8 +1033,8 @@ def rbenv(registry, xml_parent, data): for elem in mapping: (optname, xmlname, val) = elem[:3] elem_tag = o.find(xmlname) - elem_tag.set("ruby-class", "String") elem_tag.set("pluginid", "rbenv") + elem_tag.set("ruby-class", "String") ignore_local_class = "FalseClass" @@ -1046,7 +1046,7 @@ def rbenv(registry, xml_parent, data): XML.SubElement( o, "ignore__local__version", - {"ruby-class": ignore_local_class, "pluginid": "rbenv"}, + {"pluginid": "rbenv", "ruby-class": ignore_local_class}, ) @@ -1590,7 +1590,7 @@ def sauce_ondemand(registry, xml_parent, data): to your private network (default false) :arg str sauce-host: The name of the selenium host to be used. For tests run using Sauce Connect, this should be localhost. - ondemand.saucelabs.com can also be used to conenct directly to + ondemand.saucelabs.com can also be used to connect directly to Sauce OnDemand, The value of the host will be stored in the SAUCE_ONDEMAND_HOST environment variable. (default '') :arg str sauce-port: The name of the Selenium Port to be used. For |