diff --git a/jenkins_jobs/modules/general.py b/jenkins_jobs/modules/general.py index 2b295e6e6..51953a269 100644 --- a/jenkins_jobs/modules/general.py +++ b/jenkins_jobs/modules/general.py @@ -99,6 +99,7 @@ Example: import xml.etree.ElementTree as XML import jenkins_jobs.modules.base +from jenkins_jobs.xml_config import remove_ignorable_whitespace class General(jenkins_jobs.modules.base.Base): @@ -175,4 +176,5 @@ def raw(parser, xml_parent, data): # documented in definition.rst since includes and docs is not working well # For cross cutting method like this root = XML.fromstring(data.get('xml')) + remove_ignorable_whitespace(root) xml_parent.append(root) diff --git a/jenkins_jobs/xml_config.py b/jenkins_jobs/xml_config.py index ff386da84..9a0724b50 100644 --- a/jenkins_jobs/xml_config.py +++ b/jenkins_jobs/xml_config.py @@ -59,6 +59,28 @@ if sys.version_info[:3] < (2, 7, 3) or xml.__name__ != 'xml': minidom.Element.writexml = writexml +def remove_ignorable_whitespace(node): + """Remove insignificant whitespace from XML nodes + + It should only remove whitespace in between elements and sub elements. + This should be safe for Jenkins due to how it's XML serialization works + but may not be valid for other XML documents. So use this method with + caution outside of this specific library. + """ + # strip tail whitespace if it's not significant + if node.tail and node.tail.strip() == "": + node.tail = None + + for child in node.getchildren(): + # only strip whitespace from the text node if there are subelement + # nodes as this means we are removing leading whitespace before such + # sub elements. Otherwise risk removing whitespace from an element + # that only contains whitespace + if node.text and node.text.strip() == "": + node.text = None + remove_ignorable_whitespace(child) + + class XmlJob(object): def __init__(self, xml, name): self.xml = xml diff --git a/tests/base.py b/tests/base.py index b9a7d58f2..5b9f0746d 100644 --- a/tests/base.py +++ b/tests/base.py @@ -177,7 +177,6 @@ class BaseTestCase(object): pretty_xml, testtools.matchers.DocTestMatches(expected_xml, doctest.ELLIPSIS | - doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF) ) @@ -205,7 +204,6 @@ class SingleJobTestCase(BaseTestCase): pretty_xml, testtools.matchers.DocTestMatches(expected_xml, doctest.ELLIPSIS | - doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF) ) @@ -223,7 +221,6 @@ class JsonTestCase(BaseTestCase): pretty_json, testtools.matchers.DocTestMatches(expected_json, doctest.ELLIPSIS | - doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF) ) @@ -245,6 +242,5 @@ class YamlTestCase(BaseTestCase): pretty_yaml, testtools.matchers.DocTestMatches(expected_yaml, doctest.ELLIPSIS | - doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF) ) diff --git a/tests/builders/fixtures/maven-target-doc.xml b/tests/builders/fixtures/maven-target-doc.xml index b84325988..5af215b7e 100644 --- a/tests/builders/fixtures/maven-target-doc.xml +++ b/tests/builders/fixtures/maven-target-doc.xml @@ -3,12 +3,13 @@ clean - foo=bar bar=foo + foo=bar +bar=foo Maven3 parent/pom.xml true -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m - + mvn/settings.xml diff --git a/tests/builders/fixtures/python.xml b/tests/builders/fixtures/python.xml index c3b93470d..beba6da7a 100644 --- a/tests/builders/fixtures/python.xml +++ b/tests/builders/fixtures/python.xml @@ -1,8 +1,8 @@ - - - import foobar - - + + + import foobar + + diff --git a/tests/builders/fixtures/shell.xml b/tests/builders/fixtures/shell.xml index 7ab1aac84..ac3942ac7 100644 --- a/tests/builders/fixtures/shell.xml +++ b/tests/builders/fixtures/shell.xml @@ -1,8 +1,8 @@ - - - make test - - + + + make test + + diff --git a/tests/builders/fixtures/trigger-remote/trigger-remote001.xml b/tests/builders/fixtures/trigger-remote/trigger-remote001.xml index a22e0b4df..38750092e 100644 --- a/tests/builders/fixtures/trigger-remote/trigger-remote001.xml +++ b/tests/builders/fixtures/trigger-remote/trigger-remote001.xml @@ -12,7 +12,7 @@ true FOO="bar" herp="derp" - + FOO="bar" herp="derp" diff --git a/tests/duplicates/fixtures/allow_projects001.xml b/tests/duplicates/fixtures/allow_projects001.xml index 90dce6c6a..cca4681dc 100644 --- a/tests/duplicates/fixtures/allow_projects001.xml +++ b/tests/duplicates/fixtures/allow_projects001.xml @@ -19,7 +19,7 @@ - origin/stable-2 + origin/stable-2 diff --git a/tests/duplicates/fixtures/allow_templates001.xml b/tests/duplicates/fixtures/allow_templates001.xml index 90dce6c6a..cca4681dc 100644 --- a/tests/duplicates/fixtures/allow_templates001.xml +++ b/tests/duplicates/fixtures/allow_templates001.xml @@ -19,7 +19,7 @@ - origin/stable-2 + origin/stable-2 diff --git a/tests/duplicates/fixtures/duplicates001.xml b/tests/duplicates/fixtures/duplicates001.xml index 1107ce977..787f05b00 100644 --- a/tests/duplicates/fixtures/duplicates001.xml +++ b/tests/duplicates/fixtures/duplicates001.xml @@ -49,6 +49,7 @@ + diff --git a/tests/duplicates/fixtures/duplicates002.xml b/tests/duplicates/fixtures/duplicates002.xml index f2663650b..8ad81cccc 100644 --- a/tests/duplicates/fixtures/duplicates002.xml +++ b/tests/duplicates/fixtures/duplicates002.xml @@ -19,7 +19,7 @@ - origin/stable-1.1 + origin/stable-1.1 @@ -49,6 +49,7 @@ + @@ -70,7 +71,7 @@ - origin/stable-2.0 + origin/stable-2.0 diff --git a/tests/localyaml/fixtures/anchors_aliases.oyaml b/tests/localyaml/fixtures/anchors_aliases.oyaml index 77fee59b7..7fe9faa89 100644 --- a/tests/localyaml/fixtures/anchors_aliases.oyaml +++ b/tests/localyaml/fixtures/anchors_aliases.oyaml @@ -5,7 +5,6 @@ fail: true timeout: 180 - timestamps - - job_defaults: name: defaults wrappers: @@ -13,7 +12,6 @@ fail: true timeout: 180 - timestamps - - job-template: name: myjob wrappers: diff --git a/tests/localyaml/fixtures/include-raw-escaped001.json b/tests/localyaml/fixtures/include-raw-escaped001.json index df4c480f6..268b0aab7 100644 --- a/tests/localyaml/fixtures/include-raw-escaped001.json +++ b/tests/localyaml/fixtures/include-raw-escaped001.json @@ -7,7 +7,7 @@ "shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n" }, { - "shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n\n" + "shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n\n" } ] } diff --git a/tests/properties/fixtures/delivery-pipeline1.xml b/tests/properties/fixtures/delivery-pipeline1.xml index dc0f34c8c..94ff3ef15 100644 --- a/tests/properties/fixtures/delivery-pipeline1.xml +++ b/tests/properties/fixtures/delivery-pipeline1.xml @@ -1,9 +1,9 @@ - - - Stage - Task - - + + + Stage + Task + + diff --git a/tests/properties/fixtures/delivery-pipeline2.xml b/tests/properties/fixtures/delivery-pipeline2.xml index f758fa25c..2a41a7560 100644 --- a/tests/properties/fixtures/delivery-pipeline2.xml +++ b/tests/properties/fixtures/delivery-pipeline2.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + diff --git a/tests/properties/fixtures/inject001.xml b/tests/properties/fixtures/inject001.xml index ba86a948a..ff41ab8cb 100644 --- a/tests/properties/fixtures/inject001.xml +++ b/tests/properties/fixtures/inject001.xml @@ -4,8 +4,8 @@ FOO=bar - BAZ=foobar - +BAZ=foobar + false true diff --git a/tests/properties/fixtures/sidebar01.xml b/tests/properties/fixtures/sidebar01.xml index fa243e45c..49b98900c 100644 --- a/tests/properties/fixtures/sidebar01.xml +++ b/tests/properties/fixtures/sidebar01.xml @@ -1,14 +1,14 @@ - - - - https://jenkins.debian.net/userContent/about.html - About jenkins.debian.net - /userContent/images/debian-swirl-24x24.png - - - + + + + https://jenkins.debian.net/userContent/about.html + About jenkins.debian.net + /userContent/images/debian-swirl-24x24.png + + + diff --git a/tests/properties/fixtures/sidebar02.xml b/tests/properties/fixtures/sidebar02.xml index 2637b3128..067f780ba 100644 --- a/tests/properties/fixtures/sidebar02.xml +++ b/tests/properties/fixtures/sidebar02.xml @@ -17,4 +17,3 @@ - diff --git a/tests/publishers/fixtures/aggregate-flow-tests.xml b/tests/publishers/fixtures/aggregate-flow-tests.xml index 46e9f4456..f60c724f1 100644 --- a/tests/publishers/fixtures/aggregate-flow-tests.xml +++ b/tests/publishers/fixtures/aggregate-flow-tests.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/tests/publishers/fixtures/archive001.xml b/tests/publishers/fixtures/archive001.xml index d53b24c64..a9c2c5550 100644 --- a/tests/publishers/fixtures/archive001.xml +++ b/tests/publishers/fixtures/archive001.xml @@ -1,11 +1,11 @@ - - - *.tar.gz - false - true - true - - + + + *.tar.gz + false + true + true + + diff --git a/tests/publishers/fixtures/archive002.xml b/tests/publishers/fixtures/archive002.xml index 9a39683ea..3ec767384 100644 --- a/tests/publishers/fixtures/archive002.xml +++ b/tests/publishers/fixtures/archive002.xml @@ -1,12 +1,12 @@ - - - *.tar.gz - false - true - true - true - - + + + *.tar.gz + false + true + true + true + + diff --git a/tests/publishers/fixtures/archive003.xml b/tests/publishers/fixtures/archive003.xml index c35953949..621c4ed67 100644 --- a/tests/publishers/fixtures/archive003.xml +++ b/tests/publishers/fixtures/archive003.xml @@ -1,12 +1,12 @@ - - - *.tar.gz - false - true - false - true - - + + + *.tar.gz + false + true + false + true + + diff --git a/tests/publishers/fixtures/blame001.xml b/tests/publishers/fixtures/blame001.xml index d07c95039..706d71dab 100644 --- a/tests/publishers/fixtures/blame001.xml +++ b/tests/publishers/fixtures/blame001.xml @@ -4,4 +4,3 @@ - diff --git a/tests/publishers/fixtures/campfire002.xml b/tests/publishers/fixtures/campfire002.xml index a73ff0109..1972110f2 100644 --- a/tests/publishers/fixtures/campfire002.xml +++ b/tests/publishers/fixtures/campfire002.xml @@ -2,7 +2,7 @@ - + diff --git a/tests/publishers/fixtures/cifs001.xml b/tests/publishers/fixtures/cifs001.xml index ff7471330..41e52bc61 100644 --- a/tests/publishers/fixtures/cifs001.xml +++ b/tests/publishers/fixtures/cifs001.xml @@ -31,4 +31,3 @@ - diff --git a/tests/publishers/fixtures/display-upstream-changes.xml b/tests/publishers/fixtures/display-upstream-changes.xml index df462a203..2af9262f2 100644 --- a/tests/publishers/fixtures/display-upstream-changes.xml +++ b/tests/publishers/fixtures/display-upstream-changes.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/tests/publishers/fixtures/email-ext001.xml b/tests/publishers/fixtures/email-ext001.xml index f092266c2..21286605f 100644 --- a/tests/publishers/fixtures/email-ext001.xml +++ b/tests/publishers/fixtures/email-ext001.xml @@ -159,7 +159,7 @@ - text/html + text/html Subject for Build ${BUILD_NUMBER} The build has finished */foo*.log diff --git a/tests/publishers/fixtures/ftp001.xml b/tests/publishers/fixtures/ftp001.xml index c12f391a8..c6431528a 100644 --- a/tests/publishers/fixtures/ftp001.xml +++ b/tests/publishers/fixtures/ftp001.xml @@ -32,5 +32,3 @@ - - diff --git a/tests/publishers/fixtures/git001.xml b/tests/publishers/fixtures/git001.xml index 93c44e7f2..a7b692f59 100644 --- a/tests/publishers/fixtures/git001.xml +++ b/tests/publishers/fixtures/git001.xml @@ -18,7 +18,7 @@ branchremotename - some/branch + some/branch diff --git a/tests/publishers/fixtures/ircbot001.xml b/tests/publishers/fixtures/ircbot001.xml index ccc6b0c6a..f156445ad 100644 --- a/tests/publishers/fixtures/ircbot001.xml +++ b/tests/publishers/fixtures/ircbot001.xml @@ -1,27 +1,27 @@ - - - ALL - - - #jenkins-channel1 - secrete - false - - - #jenkins-channel2 - - true - - - false - false - false - false - false - ONLY_CONFIGURATIONS - + + + ALL + + + #jenkins-channel1 + secrete + false + + + #jenkins-channel2 + + true + + + false + false + false + false + false + ONLY_CONFIGURATIONS + diff --git a/tests/publishers/fixtures/ircbot002.xml b/tests/publishers/fixtures/ircbot002.xml index 03662ae14..42eba2246 100644 --- a/tests/publishers/fixtures/ircbot002.xml +++ b/tests/publishers/fixtures/ircbot002.xml @@ -1,22 +1,22 @@ - - - ALL - - - #jenkins-channel - - true - - - false - false - false - false - false - ONLY_CONFIGURATIONS - + + + ALL + + + #jenkins-channel + + true + + + false + false + false + false + false + ONLY_CONFIGURATIONS + diff --git a/tests/publishers/fixtures/jclouds001.xml b/tests/publishers/fixtures/jclouds001.xml index b086fa4c6..3f47cd2b2 100644 --- a/tests/publishers/fixtures/jclouds001.xml +++ b/tests/publishers/fixtures/jclouds001.xml @@ -1,17 +1,16 @@ - - - hp - - - jenkins - - *.tar.gz - false - - - - + + + hp + + + jenkins + + *.tar.gz + false + + + + - diff --git a/tests/publishers/fixtures/postbuildscript002.xml b/tests/publishers/fixtures/postbuildscript002.xml index 84a68d954..2ba7edba3 100644 --- a/tests/publishers/fixtures/postbuildscript002.xml +++ b/tests/publishers/fixtures/postbuildscript002.xml @@ -6,10 +6,10 @@ echo "Shell execution" - - ant_target - default - + + ant_target + default + true false diff --git a/tests/publishers/fixtures/sitemonitor001.xml b/tests/publishers/fixtures/sitemonitor001.xml index 812cfb84f..bd372d4a0 100644 --- a/tests/publishers/fixtures/sitemonitor001.xml +++ b/tests/publishers/fixtures/sitemonitor001.xml @@ -1,15 +1,15 @@ - - - - - - http://foo.example.com - - - http://bar.example.com:8080/ - - - - - + + + + + + http://foo.example.com + + + http://bar.example.com:8080/ + + + + + diff --git a/tests/publishers/fixtures/trigger_parameterized_builds001.xml b/tests/publishers/fixtures/trigger_parameterized_builds001.xml index abb421fbf..f4bb7908b 100644 --- a/tests/publishers/fixtures/trigger_parameterized_builds001.xml +++ b/tests/publishers/fixtures/trigger_parameterized_builds001.xml @@ -2,82 +2,81 @@ - - - - - foo=bar + + + + + foo=bar bar=foo - - - - other_job,foo,bar - ALWAYS - false - - - - - BUILD_NUM=${BUILD_NUMBER} - - - version.prop - true - - - other_job1, other_job2 - ALWAYS - false - - - - - foo=bar - - - false - - - label=="x86" - - - yet_another_job - ALWAYS - false - - - - - foo - - - - yet_another_job_2 - ALWAYS - false - - - - - - node-label-foo || node-label-bar - - - yet_another_job_3 - ALWAYS - false - - - - - - - test-project-same-node - ALWAYS - false - - + + + + other_job,foo,bar + ALWAYS + false + + + + + BUILD_NUM=${BUILD_NUMBER} + + + version.prop + true + + + other_job1, other_job2 + ALWAYS + false + + + + + foo=bar + + + false + + + label=="x86" + + + yet_another_job + ALWAYS + false + + + + + foo + + + + yet_another_job_2 + ALWAYS + false + + + + + + node-label-foo || node-label-bar + + + yet_another_job_3 + ALWAYS + false + + + + + + + test-project-same-node + ALWAYS + false + + - diff --git a/tests/publishers/fixtures/trigger_parameterized_builds002.xml b/tests/publishers/fixtures/trigger_parameterized_builds002.xml index 2fd87c9a4..9034db6fd 100644 --- a/tests/publishers/fixtures/trigger_parameterized_builds002.xml +++ b/tests/publishers/fixtures/trigger_parameterized_builds002.xml @@ -40,4 +40,3 @@ - diff --git a/tests/scm/fixtures/raw001.xml b/tests/scm/fixtures/raw001.xml index bd73391b8..31d692857 100644 --- a/tests/scm/fixtures/raw001.xml +++ b/tests/scm/fixtures/raw001.xml @@ -1,6 +1,6 @@ - + 2 diff --git a/tests/triggers/fixtures/github-pull-request.xml b/tests/triggers/fixtures/github-pull-request.xml index 188f75412..6fad88e55 100644 --- a/tests/triggers/fixtures/github-pull-request.xml +++ b/tests/triggers/fixtures/github-pull-request.xml @@ -4,12 +4,12 @@ * * * * * user1 - user2 +user2 true user3 - user4 +user4 org1 - org2 +org2 * * * * * retest this please true diff --git a/tests/wrappers/fixtures/credentials_binding.xml b/tests/wrappers/fixtures/credentials_binding.xml index ca31f2351..b54332331 100644 --- a/tests/wrappers/fixtures/credentials_binding.xml +++ b/tests/wrappers/fixtures/credentials_binding.xml @@ -2,29 +2,29 @@ - - - CONFIG_ZIP - b3e6f337-5d44-4f57-921c-1632d796caa6 - - - config_file - b3e6f337-5d44-4f57-921c-1632d796caab - - - config_username_password - b3e6f337-5d44-4f57-921c-1632d796caac - - - config_text - b3e6f337-5d44-4f57-921c-1632d796caad - - - myUsername - myPassword - b3e6f337-5d44-4f57-921c-1632d796caae - - + + + CONFIG_ZIP + b3e6f337-5d44-4f57-921c-1632d796caa6 + + + config_file + b3e6f337-5d44-4f57-921c-1632d796caab + + + config_username_password + b3e6f337-5d44-4f57-921c-1632d796caac + + + config_text + b3e6f337-5d44-4f57-921c-1632d796caad + + + myUsername + myPassword + b3e6f337-5d44-4f57-921c-1632d796caae + + diff --git a/tests/wrappers/fixtures/delivery-pipeline1.xml b/tests/wrappers/fixtures/delivery-pipeline1.xml index dd08e19cd..5afab7117 100644 --- a/tests/wrappers/fixtures/delivery-pipeline1.xml +++ b/tests/wrappers/fixtures/delivery-pipeline1.xml @@ -1,9 +1,9 @@ - - - 1.0.0-${BUILD_NUMBER} - true - - - \ No newline at end of file + + + 1.0.0-${BUILD_NUMBER} + true + + + diff --git a/tests/wrappers/fixtures/delivery-pipeline2.xml b/tests/wrappers/fixtures/delivery-pipeline2.xml index fd554062a..8bc3c0dfd 100644 --- a/tests/wrappers/fixtures/delivery-pipeline2.xml +++ b/tests/wrappers/fixtures/delivery-pipeline2.xml @@ -1,9 +1,9 @@ - - - - false - - - \ No newline at end of file + + + + false + + + diff --git a/tests/wrappers/fixtures/env-script001.xml b/tests/wrappers/fixtures/env-script001.xml index 4a9671ba2..267f4cb8e 100644 --- a/tests/wrappers/fixtures/env-script001.xml +++ b/tests/wrappers/fixtures/env-script001.xml @@ -2,8 +2,8 @@ - - true + + true diff --git a/tests/wrappers/fixtures/logfilesize001.xml b/tests/wrappers/fixtures/logfilesize001.xml index b49ad2c7e..755f959ef 100644 --- a/tests/wrappers/fixtures/logfilesize001.xml +++ b/tests/wrappers/fixtures/logfilesize001.xml @@ -2,9 +2,9 @@ - true - 1024 - true + true + 1024 + true diff --git a/tests/wrappers/fixtures/logfilesize002.xml b/tests/wrappers/fixtures/logfilesize002.xml index 12b6d7880..cf5ba2d8d 100644 --- a/tests/wrappers/fixtures/logfilesize002.xml +++ b/tests/wrappers/fixtures/logfilesize002.xml @@ -2,9 +2,9 @@ - false - 128 - false + false + 128 + false diff --git a/tests/wrappers/fixtures/logfilesize003.xml b/tests/wrappers/fixtures/logfilesize003.xml index d9cd1f1cf..4a06acbb0 100644 --- a/tests/wrappers/fixtures/logfilesize003.xml +++ b/tests/wrappers/fixtures/logfilesize003.xml @@ -2,9 +2,9 @@ - true - 2048 - false + true + 2048 + false diff --git a/tests/wrappers/fixtures/xvfb001.xml b/tests/wrappers/fixtures/xvfb001.xml index 50da4d9fc..b87b2b3ff 100644 --- a/tests/wrappers/fixtures/xvfb001.xml +++ b/tests/wrappers/fixtures/xvfb001.xml @@ -1,18 +1,18 @@ - - - default - false - 123 - nodes-xxx - false - 10 - 1024x768x16 - 100 - -fbdir /tmp - true - false - - + + + default + false + 123 + nodes-xxx + false + 10 + 1024x768x16 + 100 + -fbdir /tmp + true + false + + diff --git a/tests/yamlparser/fixtures/complete-raw001.yaml b/tests/yamlparser/fixtures/complete-raw001.yaml index 389560241..08a34889c 100644 --- a/tests/yamlparser/fixtures/complete-raw001.yaml +++ b/tests/yamlparser/fixtures/complete-raw001.yaml @@ -48,4 +48,4 @@ reporters: - raw: xml: - \ No newline at end of file + diff --git a/tests/yamlparser/fixtures/concat_defaults001.xml b/tests/yamlparser/fixtures/concat_defaults001.xml index 6377e0599..9770f531f 100644 --- a/tests/yamlparser/fixtures/concat_defaults001.xml +++ b/tests/yamlparser/fixtures/concat_defaults001.xml @@ -20,7 +20,7 @@ - + my project description<!-- Managed by Jenkins Job Builder --> false false diff --git a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml index 2b1b99492..8d582dbac 100644 --- a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml +++ b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml @@ -26,6 +26,7 @@ + @@ -54,6 +55,7 @@ + diff --git a/tests/yamlparser/fixtures/jobgroups_multi_use.xml b/tests/yamlparser/fixtures/jobgroups_multi_use.xml index a1da87a90..92cea780b 100644 --- a/tests/yamlparser/fixtures/jobgroups_multi_use.xml +++ b/tests/yamlparser/fixtures/jobgroups_multi_use.xml @@ -20,6 +20,7 @@ print("Doing something cool with python") + @@ -42,6 +43,7 @@ print("Doing something cool with python") + @@ -64,6 +66,7 @@ print("Doing something else cool with python") + diff --git a/tests/yamlparser/fixtures/template_override_project_level_defaults.xml b/tests/yamlparser/fixtures/template_override_project_level_defaults.xml index a9ef5d8b8..598905df5 100644 --- a/tests/yamlparser/fixtures/template_override_project_level_defaults.xml +++ b/tests/yamlparser/fixtures/template_override_project_level_defaults.xml @@ -40,6 +40,7 @@ + diff --git a/tests/yamlparser/fixtures/templates001.xml b/tests/yamlparser/fixtures/templates001.xml index f2d687698..086c8d499 100644 --- a/tests/yamlparser/fixtures/templates001.xml +++ b/tests/yamlparser/fixtures/templates001.xml @@ -23,6 +23,7 @@ +