diff options
| -rw-r--r-- | jenkins_jobs/modules/project_pipeline.py | 4 | ||||
| -rw-r--r-- | jenkins_jobs/modules/project_workflow.py | 2 | ||||
| -rw-r--r-- | jenkins_jobs/modules/wrappers.py | 8 |
3 files changed, 7 insertions, 7 deletions
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/wrappers.py b/jenkins_jobs/modules/wrappers.py index fa921860..ac8761d1 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}, ) |