diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py index 97e591b0b..b5491d7b5 100644 --- a/jenkins_jobs/modules/builders.py +++ b/jenkins_jobs/modules/builders.py @@ -2182,7 +2182,9 @@ def dsl(parser, xml_parent, data): Example: - .. literalinclude:: /../../tests/builders/fixtures/dsl.yaml + .. literalinclude:: /../../tests/builders/fixtures/dsl001.yaml + :language: yaml + .. literalinclude:: /../../tests/builders/fixtures/dsl002.yaml :language: yaml """ @@ -2194,7 +2196,7 @@ def dsl(parser, xml_parent, data): XML.SubElement(dsl, 'scriptText').text = data.get('script-text') XML.SubElement(dsl, 'usingScriptText').text = 'true' elif data.get('target'): - XML.SubElement(dsl, 'target').text = data.get('target') + XML.SubElement(dsl, 'targets').text = data.get('target') XML.SubElement(dsl, 'usingScriptText').text = 'false' else: raise MissingAttributeError(['script-text', 'target']) diff --git a/tests/builders/fixtures/dsl.xml b/tests/builders/fixtures/dsl001.xml similarity index 100% rename from tests/builders/fixtures/dsl.xml rename to tests/builders/fixtures/dsl001.xml diff --git a/tests/builders/fixtures/dsl.yaml b/tests/builders/fixtures/dsl001.yaml similarity index 100% rename from tests/builders/fixtures/dsl.yaml rename to tests/builders/fixtures/dsl001.yaml diff --git a/tests/builders/fixtures/dsl002.xml b/tests/builders/fixtures/dsl002.xml new file mode 100644 index 000000000..b4a97d87c --- /dev/null +++ b/tests/builders/fixtures/dsl002.xml @@ -0,0 +1,14 @@ + + + + + jobs/**/*.groovy + false + true + DISABLE + DELETE + SEED_JOB + *.jar + + + diff --git a/tests/builders/fixtures/dsl002.yaml b/tests/builders/fixtures/dsl002.yaml new file mode 100644 index 000000000..b10a9b174 --- /dev/null +++ b/tests/builders/fixtures/dsl002.yaml @@ -0,0 +1,8 @@ +builders: + - dsl: + target: "jobs/**/*.groovy" + ignore-existing: "true" + removed-job-action: "DISABLE" + removed-view-action: "DELETE" + lookup-strategy: "SEED_JOB" + additional-classpath: "*.jar"