diff --git a/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml b/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml index e10d2e5d3..f428aa961 100644 --- a/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml +++ b/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml @@ -10,7 +10,7 @@ path/to/install /usr/bin/make make new-install - -DCMAKE_FIND_ROOT_PATH="path/to/something/else" + -DCMAKE_FIND_ROOT_PATH="path/to/something/else" /usr/bin/cmake true Debug diff --git a/tests/builders/fixtures/cmake/version-2.0/complete-2.x.xml b/tests/builders/fixtures/cmake/version-2.0/complete-2.x.xml index 230cf313b..7f0a7da28 100644 --- a/tests/builders/fixtures/cmake/version-2.0/complete-2.x.xml +++ b/tests/builders/fixtures/cmake/version-2.0/complete-2.x.xml @@ -9,7 +9,7 @@ path/to/build CustomReleaseType CMake custom install - -DCMAKE_FIND_ROOT_PATH="path/to/something/else" + -DCMAKE_FIND_ROOT_PATH="path/to/something/else" true @@ -21,8 +21,8 @@ URL=http://www.example.org/ false test - RESTRICT="TRUE" -TARGET="NONE" + RESTRICT="TRUE" +TARGET="NONE" diff --git a/tests/builders/fixtures/docker-builder001.xml b/tests/builders/fixtures/docker-builder001.xml index 57d74d21f..a191df4ce 100644 --- a/tests/builders/fixtures/docker-builder001.xml +++ b/tests/builders/fixtures/docker-builder001.xml @@ -13,7 +13,7 @@ /tmp/ /tmp/ true - --build-arg https_proxy="http://some.proxy:port" + --build-arg https_proxy="http://some.proxy:port" true diff --git a/tests/builders/fixtures/docker-builder002.xml b/tests/builders/fixtures/docker-builder002.xml index 960fe753f..3cfa0617a 100644 --- a/tests/builders/fixtures/docker-builder002.xml +++ b/tests/builders/fixtures/docker-builder002.xml @@ -13,7 +13,7 @@ /tmp/ /tmp/ true - --build-arg https_proxy="http://some.proxy:port" + --build-arg https_proxy="http://some.proxy:port" true docker-server diff --git a/tests/builders/fixtures/jms-messaging-full.xml b/tests/builders/fixtures/jms-messaging-full.xml index ec566b25a..2bbd6d862 100644 --- a/tests/builders/fixtures/jms-messaging-full.xml +++ b/tests/builders/fixtures/jms-messaging-full.xml @@ -11,15 +11,15 @@ username=fedora-atomic { - "build_url": "${BUILD_URL}", - "compose_url": "<full-url-to-compose>", - "build_id": "${BUILD_ID}", - "ref": "fedora/rawhide/${basearch}/atomic-host", - "rev": "<sha of the commit from dist-git>", - "namespace": "rpms", - "repo": "php-simplepie", - "status": "<success/failure/aborted>", - "test_guidance": "<comma-separated-list-of-test-suites-to-run>" + "build_url": "${BUILD_URL}", + "compose_url": "<full-url-to-compose>", + "build_id": "${BUILD_ID}", + "ref": "fedora/rawhide/${basearch}/atomic-host", + "rev": "<sha of the commit from dist-git>", + "namespace": "rpms", + "repo": "php-simplepie", + "status": "<success/failure/aborted>", + "test_guidance": "<comma-separated-list-of-test-suites-to-run>" } diff --git a/tests/builders/fixtures/multibuild.xml b/tests/builders/fixtures/multibuild.xml index a0f7b5893..13f969fca 100644 --- a/tests/builders/fixtures/multibuild.xml +++ b/tests/builders/fixtures/multibuild.xml @@ -60,7 +60,7 @@ false - JVM_VARIANT == "server" + JVM_VARIANT == "server" false diff --git a/tests/builders/fixtures/trigger-builds-configfactory-multi.xml b/tests/builders/fixtures/trigger-builds-configfactory-multi.xml index e4ef3e31f..12ac82ff7 100644 --- a/tests/builders/fixtures/trigger-builds-configfactory-multi.xml +++ b/tests/builders/fixtures/trigger-builds-configfactory-multi.xml @@ -8,7 +8,7 @@ - FOO="bar" + FOO="bar" diff --git a/tests/builders/fixtures/trigger-builds001.xml b/tests/builders/fixtures/trigger-builds001.xml index 4331e4bfe..4ba43d78a 100644 --- a/tests/builders/fixtures/trigger-builds001.xml +++ b/tests/builders/fixtures/trigger-builds001.xml @@ -8,7 +8,7 @@ - FOO="bar" + FOO="bar" build_started diff --git a/tests/builders/fixtures/trigger-builds003.xml b/tests/builders/fixtures/trigger-builds003.xml index 492f91d4b..af9ad8708 100644 --- a/tests/builders/fixtures/trigger-builds003.xml +++ b/tests/builders/fixtures/trigger-builds003.xml @@ -7,7 +7,7 @@ - FOO="bar" + FOO="bar" diff --git a/tests/builders/fixtures/trigger-builds006.xml b/tests/builders/fixtures/trigger-builds006.xml index 5102fd67d..f7096723a 100644 --- a/tests/builders/fixtures/trigger-builds006.xml +++ b/tests/builders/fixtures/trigger-builds006.xml @@ -10,7 +10,7 @@ false - FOO="bar" + FOO="bar" NODE diff --git a/tests/builders/fixtures/trigger-builds008.xml b/tests/builders/fixtures/trigger-builds008.xml index fed3f0b89..a600e06cd 100644 --- a/tests/builders/fixtures/trigger-builds008.xml +++ b/tests/builders/fixtures/trigger-builds008.xml @@ -6,7 +6,7 @@ - label=="x86" + label=="x86" build_started diff --git a/tests/builders/fixtures/trigger-remote/trigger-remote001.xml b/tests/builders/fixtures/trigger-remote/trigger-remote001.xml index fd3ed0f09..b71fab95b 100644 --- a/tests/builders/fixtures/trigger-remote/trigger-remote001.xml +++ b/tests/builders/fixtures/trigger-remote/trigger-remote001.xml @@ -11,12 +11,12 @@ true true true - FOO="bar" -herp="derp" + FOO="bar" +herp="derp" - FOO="bar" - herp="derp" + FOO="bar" + herp="derp" true .props diff --git a/tests/cmd/fixtures/unicode-replace001.xml b/tests/cmd/fixtures/unicode-replace001.xml index 4828deeb8..d8d399ae1 100644 --- a/tests/cmd/fixtures/unicode-replace001.xml +++ b/tests/cmd/fixtures/unicode-replace001.xml @@ -16,7 +16,7 @@ #!/bin/bash -echo "Unicode! ?" +echo "Unicode! ?" diff --git a/tests/conftest.py b/tests/conftest.py index 372bda619..3497884f2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -157,7 +157,12 @@ def check_generator(scenario, input, expected_output, jjb_config, registry, proj generator = Generator(registry) generator.gen_xml(xml, input) - pretty_xml = XmlJob(xml, "fixturejob").output().decode() + pretty_xml = ( + XmlJob(xml, "fixturejob") + .output() + .decode() + .replace(""", '"') # Ensure compatibility with Python < 3.13 + ) assert expected_output == pretty_xml return check @@ -198,6 +203,7 @@ def check_job(scenario, expected_output, jjb_config, registry): "\n".join(job.output().decode() for job in job_xml_list) .strip() .replace("\n\n", "\n") + .replace(""", '"') # Ensure compatibility with Python < 3.13 ) if expected_output is None: return diff --git a/tests/jsonparser/fixtures/complete001.xml b/tests/jsonparser/fixtures/complete001.xml index 2e52c1368..0765ba048 100644 --- a/tests/jsonparser/fixtures/complete001.xml +++ b/tests/jsonparser/fixtures/complete001.xml @@ -116,7 +116,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") @@ -136,12 +136,12 @@ print("Doing something cool with python") #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" #!/bin/zsh -echo "Doing somethin cool with zsh" +echo "Doing somethin cool with zsh" diff --git a/tests/loader/fixtures/include-raw-expand-template.xml b/tests/loader/fixtures/include-raw-expand-template.xml index 4249b3e50..4f852b548 100644 --- a/tests/loader/fixtures/include-raw-expand-template.xml +++ b/tests/loader/fixtures/include-raw-expand-template.xml @@ -16,13 +16,13 @@ # sample script to check that variables are expanded # when using the !include-raw-expand: application yaml tag -VAR1="1" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="1" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/loader/fixtures/include-raw-verbatim-job.xml b/tests/loader/fixtures/include-raw-verbatim-job.xml index f164110ec..7b978162a 100644 --- a/tests/loader/fixtures/include-raw-verbatim-job.xml +++ b/tests/loader/fixtures/include-raw-verbatim-job.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that variables aren't expanded # when using the !include-raw-verbatim: application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/loader/fixtures/include-raw-verbatim-multi-job.xml b/tests/loader/fixtures/include-raw-verbatim-multi-job.xml index ba62d0292..09b253674 100644 --- a/tests/loader/fixtures/include-raw-verbatim-multi-job.xml +++ b/tests/loader/fixtures/include-raw-verbatim-multi-job.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -26,13 +26,13 @@ exit 0 # sample script to check that variables aren't expanded # when using the !include-raw-verbatim: application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/loader/fixtures/include-raw-verbatim-multi-template.xml b/tests/loader/fixtures/include-raw-verbatim-multi-template.xml index ba62d0292..09b253674 100644 --- a/tests/loader/fixtures/include-raw-verbatim-multi-template.xml +++ b/tests/loader/fixtures/include-raw-verbatim-multi-template.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -26,13 +26,13 @@ exit 0 # sample script to check that variables aren't expanded # when using the !include-raw-verbatim: application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/loader/fixtures/include-raw-verbatim-template.xml b/tests/loader/fixtures/include-raw-verbatim-template.xml index f164110ec..7b978162a 100644 --- a/tests/loader/fixtures/include-raw-verbatim-template.xml +++ b/tests/loader/fixtures/include-raw-verbatim-template.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that variables aren't expanded # when using the !include-raw-verbatim: application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/macros/fixtures/builder/multi-line-strings001.xml b/tests/macros/fixtures/builder/multi-line-strings001.xml index d1c7294a7..37f58d386 100644 --- a/tests/macros/fixtures/builder/multi-line-strings001.xml +++ b/tests/macros/fixtures/builder/multi-line-strings001.xml @@ -19,9 +19,9 @@ DIFFERENT_ENV_VAR=different # Debug output -echo -e "\n\n\n" +echo -e "\n\n\n" sort | env -echo -e "\n\n\n" +echo -e "\n\n\n" # Test Command bundle install diff --git a/tests/parameters/fixtures/extended-choice-param-full.xml b/tests/parameters/fixtures/extended-choice-param-full.xml index 295be07d1..200f3aae5 100644 --- a/tests/parameters/fixtures/extended-choice-param-full.xml +++ b/tests/parameters/fixtures/extended-choice-param-full.xml @@ -136,7 +136,7 @@ - import net.sf.json.JSONObject; def jsonEditorOptions = JSONObject.fromObject(/{schema: {"type": "object", "title": "Name", "properties": {"name": {"type": "string", "propertyOrder" : 1}}}}/); + import net.sf.json.JSONObject; def jsonEditorOptions = JSONObject.fromObject(/{schema: {"type": "object", "title": "Name", "properties": {"name": {"type": "string", "propertyOrder" : 1}}}}/); diff --git a/tests/properties/fixtures/batch-task.xml b/tests/properties/fixtures/batch-task.xml index 9740f8a26..e15e8f9a7 100644 --- a/tests/properties/fixtures/batch-task.xml +++ b/tests/properties/fixtures/batch-task.xml @@ -9,7 +9,7 @@ say hello - + diff --git a/tests/publishers/fixtures/jms-messaging-full.xml b/tests/publishers/fixtures/jms-messaging-full.xml index 26057a712..bb1c0d0eb 100644 --- a/tests/publishers/fixtures/jms-messaging-full.xml +++ b/tests/publishers/fixtures/jms-messaging-full.xml @@ -11,15 +11,15 @@ username=fedora-atomic { - "build_url": "${BUILD_URL}", - "compose_url": "<full-url-to-compose>", - "build_id": "${BUILD_ID}", - "ref": "fedora/rawhide/${basearch}/atomic-host", - "rev": "<sha of the commit from dist-git>", - "namespace": "rpms", - "repo": "php-simplepie", - "status": "<success/failure/aborted>", - "test_guidance": "<comma-separated-list-of-test-suites-to-run>"} + "build_url": "${BUILD_URL}", + "compose_url": "<full-url-to-compose>", + "build_id": "${BUILD_ID}", + "ref": "fedora/rawhide/${basearch}/atomic-host", + "rev": "<sha of the commit from dist-git>", + "namespace": "rpms", + "repo": "php-simplepie", + "status": "<success/failure/aborted>", + "test_guidance": "<comma-separated-list-of-test-suites-to-run>"} diff --git a/tests/publishers/fixtures/post-tasks001.xml b/tests/publishers/fixtures/post-tasks001.xml index a30dc22ec..b79e06ab7 100644 --- a/tests/publishers/fixtures/post-tasks001.xml +++ b/tests/publishers/fixtures/post-tasks001.xml @@ -20,7 +20,7 @@ true true - diff --git a/tests/publishers/fixtures/post-tasks002.xml b/tests/publishers/fixtures/post-tasks002.xml index 33e03c4ef..f8c8cb4e2 100644 --- a/tests/publishers/fixtures/post-tasks002.xml +++ b/tests/publishers/fixtures/post-tasks002.xml @@ -12,7 +12,7 @@ true true - diff --git a/tests/publishers/fixtures/postbuildscript-full.xml b/tests/publishers/fixtures/postbuildscript-full.xml index f6a24073c..f5bf453a1 100644 --- a/tests/publishers/fixtures/postbuildscript-full.xml +++ b/tests/publishers/fixtures/postbuildscript-full.xml @@ -54,7 +54,7 @@ MATRIX MASTER - println "Hello world!" + println "Hello world!" @@ -63,8 +63,8 @@ FAILURE SLAVE - println "Hello world!" -println "Multi-line script" + println "Hello world!" +println "Multi-line script" @@ -78,7 +78,7 @@ println "Multi-line script" MASTER - echo "Hello world!" + echo "Hello world!" @@ -92,10 +92,10 @@ println "Multi-line script" SLAVE - echo "Hello world!" + echo "Hello world!" - echo "Goodbye world!" + echo "Goodbye world!" diff --git a/tests/publishers/fixtures/postbuildscript002.xml b/tests/publishers/fixtures/postbuildscript002.xml index e40ebb1c3..b3aaca0cc 100644 --- a/tests/publishers/fixtures/postbuildscript002.xml +++ b/tests/publishers/fixtures/postbuildscript002.xml @@ -5,7 +5,7 @@ false - echo "Shell execution" + echo "Shell execution" ant_target diff --git a/tests/publishers/fixtures/postbuildscript003.xml b/tests/publishers/fixtures/postbuildscript003.xml index d10483c05..b21dddf98 100644 --- a/tests/publishers/fixtures/postbuildscript003.xml +++ b/tests/publishers/fixtures/postbuildscript003.xml @@ -5,7 +5,7 @@ false - echo "Shell execution" + echo "Shell execution" true diff --git a/tests/publishers/fixtures/postbuildscript004.xml b/tests/publishers/fixtures/postbuildscript004.xml index 5c22eb207..7fa96de96 100644 --- a/tests/publishers/fixtures/postbuildscript004.xml +++ b/tests/publishers/fixtures/postbuildscript004.xml @@ -5,7 +5,7 @@ true - echo "Shell execution should be first" + echo "Shell execution should be first" ant_target diff --git a/tests/publishers/fixtures/trigger_parameterized_builds001.xml b/tests/publishers/fixtures/trigger_parameterized_builds001.xml index 83da91d7c..1057cffd9 100644 --- a/tests/publishers/fixtures/trigger_parameterized_builds001.xml +++ b/tests/publishers/fixtures/trigger_parameterized_builds001.xml @@ -44,7 +44,7 @@ bar=foo true - label=="x86" + label=="x86" yet_another_job diff --git a/tests/scm/fixtures/repo001.xml b/tests/scm/fixtures/repo001.xml index 275375902..ce2fb7e5c 100644 --- a/tests/scm/fixtures/repo001.xml +++ b/tests/scm/fixtures/repo001.xml @@ -18,10 +18,10 @@ build https://internal.net/projects/repo ~/git/project/ - <?xml version="1.0" encoding="UTF-8"?> + <?xml version="1.0" encoding="UTF-8"?> <manifest> - <project path="external/project" name="org/project" - remote="gerrit" revision="master" /> + <project path="external/project" name="org/project" + remote="gerrit" revision="master" /> </manifest> diff --git a/tests/triggers/fixtures/jms-messaging001.xml b/tests/triggers/fixtures/jms-messaging001.xml index 02ac8aa8d..671648cf5 100644 --- a/tests/triggers/fixtures/jms-messaging001.xml +++ b/tests/triggers/fixtures/jms-messaging001.xml @@ -4,7 +4,7 @@ true - topic = "org.fedoraproject.prod.fedimg.image.upload" + topic = "org.fedoraproject.prod.fedimg.image.upload" fedmsg diff --git a/tests/triggers/fixtures/jms-messaging002.xml b/tests/triggers/fixtures/jms-messaging002.xml index a73fb8b1e..bfca50cfc 100644 --- a/tests/triggers/fixtures/jms-messaging002.xml +++ b/tests/triggers/fixtures/jms-messaging002.xml @@ -4,7 +4,7 @@ false - topic = "org.fedoraproject.prod.fedimg.image.upload" + topic = "org.fedoraproject.prod.fedimg.image.upload" fedmsg diff --git a/tests/wrappers/fixtures/artifactory005.xml b/tests/wrappers/fixtures/artifactory005.xml index f30dd10d7..7e95122d0 100644 --- a/tests/wrappers/fixtures/artifactory005.xml +++ b/tests/wrappers/fixtures/artifactory005.xml @@ -12,10 +12,10 @@ - { "files": [ { "pattern": "*.jar", "target": "release" } ] } + { "files": [ { "pattern": "*.jar", "target": "release" } ] } - { "files": [ { "pattern": "*.jar", "target": "release" } ] } + { "files": [ { "pattern": "*.jar", "target": "release" } ] } true diff --git a/tests/wrappers/fixtures/pre-scm-buildstep-no-buildsteps.xml b/tests/wrappers/fixtures/pre-scm-buildstep-no-buildsteps.xml index 3f2c11d86..c412a1303 100644 --- a/tests/wrappers/fixtures/pre-scm-buildstep-no-buildsteps.xml +++ b/tests/wrappers/fixtures/pre-scm-buildstep-no-buildsteps.xml @@ -5,12 +5,12 @@ #!/bin/bash -echo "Doing something cool" +echo "Doing something cool" #!/bin/zsh -echo "Doing something cool with zsh" +echo "Doing something cool with zsh" diff --git a/tests/wrappers/fixtures/pre-scm-buildstep001.xml b/tests/wrappers/fixtures/pre-scm-buildstep001.xml index e29a60ba0..20ce3f060 100644 --- a/tests/wrappers/fixtures/pre-scm-buildstep001.xml +++ b/tests/wrappers/fixtures/pre-scm-buildstep001.xml @@ -5,12 +5,12 @@ #!/bin/bash -echo "Doing something cool" +echo "Doing something cool" #!/bin/zsh -echo "Doing something cool with zsh" +echo "Doing something cool with zsh" diff --git a/tests/wrappers/fixtures/pre-scm-buildstep002.xml b/tests/wrappers/fixtures/pre-scm-buildstep002.xml index 3f2c11d86..c412a1303 100644 --- a/tests/wrappers/fixtures/pre-scm-buildstep002.xml +++ b/tests/wrappers/fixtures/pre-scm-buildstep002.xml @@ -5,12 +5,12 @@ #!/bin/bash -echo "Doing something cool" +echo "Doing something cool" #!/bin/zsh -echo "Doing something cool with zsh" +echo "Doing something cool with zsh" diff --git a/tests/wrappers/fixtures/version-number001.xml b/tests/wrappers/fixtures/version-number001.xml index feee536f8..3d3cd8743 100644 --- a/tests/wrappers/fixtures/version-number001.xml +++ b/tests/wrappers/fixtures/version-number001.xml @@ -3,7 +3,7 @@ relVersion - ${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z} + ${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z} relVersion false false diff --git a/tests/yamlparser/job_fixtures/add_managed_to_desc.xml b/tests/yamlparser/job_fixtures/add_managed_to_desc.xml index b9ec92da0..86e76c07a 100644 --- a/tests/yamlparser/job_fixtures/add_managed_to_desc.xml +++ b/tests/yamlparser/job_fixtures/add_managed_to_desc.xml @@ -13,7 +13,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") diff --git a/tests/yamlparser/job_fixtures/allow_empty_variables.xml b/tests/yamlparser/job_fixtures/allow_empty_variables.xml index 89ace80da..67a524b09 100644 --- a/tests/yamlparser/job_fixtures/allow_empty_variables.xml +++ b/tests/yamlparser/job_fixtures/allow_empty_variables.xml @@ -11,7 +11,7 @@ - echo "This should be empty: " + echo "This should be empty: " diff --git a/tests/yamlparser/job_fixtures/allow_empty_variables_include.xml b/tests/yamlparser/job_fixtures/allow_empty_variables_include.xml index b8d1fd2cb..511e884d0 100644 --- a/tests/yamlparser/job_fixtures/allow_empty_variables_include.xml +++ b/tests/yamlparser/job_fixtures/allow_empty_variables_include.xml @@ -11,7 +11,7 @@ - echo "Here -><- you should see nothing" + echo "Here -><- you should see nothing" diff --git a/tests/yamlparser/job_fixtures/complete001.xml b/tests/yamlparser/job_fixtures/complete001.xml index 7246737e9..9f90de2b7 100644 --- a/tests/yamlparser/job_fixtures/complete001.xml +++ b/tests/yamlparser/job_fixtures/complete001.xml @@ -114,7 +114,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") @@ -134,12 +134,12 @@ print("Doing something cool with python") #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" #!/bin/zsh -echo "Doing somethin cool with zsh" +echo "Doing somethin cool with zsh" diff --git a/tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml b/tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml index 5543972d1..a84b18d72 100644 --- a/tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml +++ b/tests/yamlparser/job_fixtures/default_template_variables_id_multi.xml @@ -12,9 +12,9 @@ - echo "Variable: Goodbye World" -echo "Allow empty Variable: Goodbye World" -echo "show that we expand for num: 1" + echo "Variable: Goodbye World" +echo "Allow empty Variable: Goodbye World" +echo "show that we expand for num: 1" @@ -36,9 +36,9 @@ echo "show that we expand for num: 1" - echo "Variable: Goodbye World" -echo "Allow empty Variable: Goodbye World" -echo "show that we expand for num: 2" + echo "Variable: Goodbye World" +echo "Allow empty Variable: Goodbye World" +echo "show that we expand for num: 2" diff --git a/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped001.xml b/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped001.xml index 28a36363b..b6ab90437 100644 --- a/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped001.xml +++ b/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped001.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that brackets aren't expanded # when using the include-raw-escape application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped002.xml b/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped002.xml index 28a36363b..b6ab90437 100644 --- a/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped002.xml +++ b/tests/yamlparser/job_fixtures/deprecated-include-raw-escaped002.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that brackets aren't expanded # when using the include-raw-escape application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/deprecated-include-raw001.xml b/tests/yamlparser/job_fixtures/deprecated-include-raw001.xml index 3d46a8a43..01367d281 100644 --- a/tests/yamlparser/job_fixtures/deprecated-include-raw001.xml +++ b/tests/yamlparser/job_fixtures/deprecated-include-raw001.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that brackets are expanded # when using the include-raw application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/deprecated-include-raw002.xml b/tests/yamlparser/job_fixtures/deprecated-include-raw002.xml index a1b3e42e0..e23c52d42 100644 --- a/tests/yamlparser/job_fixtures/deprecated-include-raw002.xml +++ b/tests/yamlparser/job_fixtures/deprecated-include-raw002.xml @@ -17,7 +17,7 @@ # to inline scripts that are maintained outside of the jenkins # job yaml configuration. -echo "hello world" +echo "hello world" exit 0 @@ -28,13 +28,13 @@ exit 0 # sample script to check that brackets aren't expanded # when using the include-raw application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/dont_overwrite_desc.xml b/tests/yamlparser/job_fixtures/dont_overwrite_desc.xml index 70a125ad1..e7f8ded88 100644 --- a/tests/yamlparser/job_fixtures/dont_overwrite_desc.xml +++ b/tests/yamlparser/job_fixtures/dont_overwrite_desc.xml @@ -12,7 +12,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") diff --git a/tests/yamlparser/job_fixtures/filter_modules.xml b/tests/yamlparser/job_fixtures/filter_modules.xml index 6215eb6a4..b4095e4ea 100644 --- a/tests/yamlparser/job_fixtures/filter_modules.xml +++ b/tests/yamlparser/job_fixtures/filter_modules.xml @@ -11,7 +11,7 @@ - my_filter says "hello" + my_filter says "hello" diff --git a/tests/yamlparser/job_fixtures/include-param.xml b/tests/yamlparser/job_fixtures/include-param.xml index e560b295c..9f3bcdd43 100644 --- a/tests/yamlparser/job_fixtures/include-param.xml +++ b/tests/yamlparser/job_fixtures/include-param.xml @@ -11,7 +11,7 @@ - echo "param=bar" + echo "param=bar" @@ -31,7 +31,7 @@ - echo "param=foo" + echo "param=foo" diff --git a/tests/yamlparser/job_fixtures/include-raw-expand-unicode.xml b/tests/yamlparser/job_fixtures/include-raw-expand-unicode.xml index 1c91ed6d5..8622f6ab5 100644 --- a/tests/yamlparser/job_fixtures/include-raw-expand-unicode.xml +++ b/tests/yamlparser/job_fixtures/include-raw-expand-unicode.xml @@ -16,7 +16,7 @@ #!/bin/bash -echo "Unicode! ☃" +echo "Unicode! ☃" diff --git a/tests/yamlparser/job_fixtures/include-raw-expand.xml b/tests/yamlparser/job_fixtures/include-raw-expand.xml index 665973b3e..9bae3b71e 100644 --- a/tests/yamlparser/job_fixtures/include-raw-expand.xml +++ b/tests/yamlparser/job_fixtures/include-raw-expand.xml @@ -39,12 +39,12 @@ #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" #!/bin/zsh -echo "Doing somethin cool with zsh" +echo "Doing somethin cool with zsh" diff --git a/tests/yamlparser/job_fixtures/include-raw-verbatim.xml b/tests/yamlparser/job_fixtures/include-raw-verbatim.xml index df88edfe0..4dfbad299 100644 --- a/tests/yamlparser/job_fixtures/include-raw-verbatim.xml +++ b/tests/yamlparser/job_fixtures/include-raw-verbatim.xml @@ -32,11 +32,11 @@ # test script containing some variables to show how you can include scripts # into job template definitions provided you use the !include-raw-verbatim: tag -MSG="hello world" +MSG="hello world" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" + echo "${MSG}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/include001.xml b/tests/yamlparser/job_fixtures/include001.xml index e4da04b76..6f3cc9e43 100644 --- a/tests/yamlparser/job_fixtures/include001.xml +++ b/tests/yamlparser/job_fixtures/include001.xml @@ -39,12 +39,12 @@ #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" #!/bin/zsh -echo "Doing somethin cool with zsh" +echo "Doing somethin cool with zsh" diff --git a/tests/yamlparser/job_fixtures/include002.xml b/tests/yamlparser/job_fixtures/include002.xml index f341ef024..83ece0baa 100644 --- a/tests/yamlparser/job_fixtures/include002.xml +++ b/tests/yamlparser/job_fixtures/include002.xml @@ -16,13 +16,13 @@ # sample script to check that variables aren't expanded # when using the !include-raw-verbatim: application yaml tag -VAR1="hello" -VAR2="world" -VAR3="${VAR1} ${VAR2}" +VAR1="hello" +VAR2="world" +VAR3="${VAR1} ${VAR2}" -[[ -n "${VAR3}" ]] && { +[[ -n "${VAR3}" ]] && { # this next section is executed as one - echo "${VAR3}" + echo "${VAR3}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/jinja-yaml03.xml b/tests/yamlparser/job_fixtures/jinja-yaml03.xml index 052f28641..be968e130 100644 --- a/tests/yamlparser/job_fixtures/jinja-yaml03.xml +++ b/tests/yamlparser/job_fixtures/jinja-yaml03.xml @@ -15,7 +15,7 @@ 0 false diff --git a/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml b/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml index 2cbd4fafd..43724f31f 100644 --- a/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml +++ b/tests/yamlparser/job_fixtures/jinja-yaml04-deepcopy.xml @@ -11,7 +11,7 @@ - echo "['repo-1', 'repo-2', 'repo-a1', 'repo-a2']" + echo "['repo-1', 'repo-2', 'repo-a1', 'repo-a2']" @@ -30,7 +30,7 @@ - echo "['repo-1', 'repo-2', 'repo-b1', 'repo-b2']" + echo "['repo-1', 'repo-2', 'repo-b1', 'repo-b2']" diff --git a/tests/yamlparser/job_fixtures/job_honor_defaults_project_type.xml b/tests/yamlparser/job_fixtures/job_honor_defaults_project_type.xml index b6108c1e9..532d134db 100644 --- a/tests/yamlparser/job_fixtures/job_honor_defaults_project_type.xml +++ b/tests/yamlparser/job_fixtures/job_honor_defaults_project_type.xml @@ -1,7 +1,7 @@ - false diff --git a/tests/yamlparser/job_fixtures/job_instantiation_with_null_params.xml b/tests/yamlparser/job_fixtures/job_instantiation_with_null_params.xml index 8a8fa25fe..6d1461684 100644 --- a/tests/yamlparser/job_fixtures/job_instantiation_with_null_params.xml +++ b/tests/yamlparser/job_fixtures/job_instantiation_with_null_params.xml @@ -11,7 +11,7 @@ - echo "hello" + echo "hello" diff --git a/tests/yamlparser/job_fixtures/jobgroups_multi_use.xml b/tests/yamlparser/job_fixtures/jobgroups_multi_use.xml index 92cea780b..0aea4d561 100644 --- a/tests/yamlparser/job_fixtures/jobgroups_multi_use.xml +++ b/tests/yamlparser/job_fixtures/jobgroups_multi_use.xml @@ -13,7 +13,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") @@ -36,7 +36,7 @@ print("Doing something cool with python") #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") @@ -59,7 +59,7 @@ print("Doing something cool with python") #!/usr/bin/env python # -print("Doing something else cool with python") +print("Doing something else cool with python") @@ -82,7 +82,7 @@ print("Doing something else cool with python") #!/usr/bin/env python # -print("Doing something else cool with python") +print("Doing something else cool with python") diff --git a/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml index 4d0d39bfe..fa59422f2 100644 --- a/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml +++ b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.xml @@ -15,18 +15,18 @@ # # version 1.1 of the echo vars script -MSG="hello world" -VERSION="1.1" +MSG="hello world" +VERSION="1.1" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" - echo "version: ${VERSION}" + echo "${MSG}" + echo "version: ${VERSION}" exit 0 } #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" diff --git a/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml index 20517898f..6972494d2 100644 --- a/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml +++ b/tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.xml @@ -15,13 +15,13 @@ # # version 1.1 of the echo vars script -MSG="hello world" -VERSION="1.1" +MSG="hello world" +VERSION="1.1" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" - echo "version: ${VERSION}" + echo "${MSG}" + echo "version: ${VERSION}" exit 0 } @@ -48,13 +48,13 @@ VERSION="1.1" # # version 1.2 of the echo vars script -MSG="hello world" -VERSION="1.2" +MSG="hello world" +VERSION="1.2" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" - echo "version: ${VERSION}" + echo "${MSG}" + echo "version: ${VERSION}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/lazy-load-jobs001.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs001.xml index bc6d7aeb7..94b3451f0 100644 --- a/tests/yamlparser/job_fixtures/lazy-load-jobs001.xml +++ b/tests/yamlparser/job_fixtures/lazy-load-jobs001.xml @@ -15,13 +15,13 @@ # # version 1.1 of the echo vars script -MSG="hello world" -VERSION="1.1" +MSG="hello world" +VERSION="1.1" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" - echo "version: ${VERSION}" + echo "${MSG}" + echo "version: ${VERSION}" exit 0 } diff --git a/tests/yamlparser/job_fixtures/lazy-load-jobs002.xml b/tests/yamlparser/job_fixtures/lazy-load-jobs002.xml index b44a01546..e8777ec61 100644 --- a/tests/yamlparser/job_fixtures/lazy-load-jobs002.xml +++ b/tests/yamlparser/job_fixtures/lazy-load-jobs002.xml @@ -15,13 +15,13 @@ # # version 1.2 of the echo vars script -MSG="hello world" -VERSION="1.2" +MSG="hello world" +VERSION="1.2" -[[ -n "${MSG}" ]] && { +[[ -n "${MSG}" ]] && { # this next section is executed as one - echo "${MSG}" - echo "version: ${VERSION}" + echo "${MSG}" + echo "version: ${VERSION}" exit 0 } @@ -43,12 +43,12 @@ VERSION="1.2" #!/bin/bash -echo "Doing somethiung cool" +echo "Doing somethiung cool" #!/bin/zsh -echo "Doing somethin cool with zsh" +echo "Doing somethin cool with zsh" diff --git a/tests/yamlparser/job_fixtures/macro-uses-custom-defaults.xml b/tests/yamlparser/job_fixtures/macro-uses-custom-defaults.xml index c92c9391d..eb08ab005 100644 --- a/tests/yamlparser/job_fixtures/macro-uses-custom-defaults.xml +++ b/tests/yamlparser/job_fixtures/macro-uses-custom-defaults.xml @@ -12,23 +12,23 @@ - echo "builder-without-params: Should be expanded: sample global param value" + echo "builder-without-params: Should be expanded: sample global param value" - echo "include-raw-expand: Should be expanded: sample global param value" + echo "include-raw-expand: Should be expanded: sample global param value" - echo "builder-with-params: Should be expanded: sample macro param value" + echo "builder-with-params: Should be expanded: sample macro param value" - echo "builder-with-params: Should be expanded: sample global param value" + echo "builder-with-params: Should be expanded: sample global param value" - echo "include-raw-expand: Should be expanded: sample global param value" + echo "include-raw-expand: Should be expanded: sample global param value" diff --git a/tests/yamlparser/job_fixtures/macro-uses-global-defaults.xml b/tests/yamlparser/job_fixtures/macro-uses-global-defaults.xml index c92c9391d..eb08ab005 100644 --- a/tests/yamlparser/job_fixtures/macro-uses-global-defaults.xml +++ b/tests/yamlparser/job_fixtures/macro-uses-global-defaults.xml @@ -12,23 +12,23 @@ - echo "builder-without-params: Should be expanded: sample global param value" + echo "builder-without-params: Should be expanded: sample global param value" - echo "include-raw-expand: Should be expanded: sample global param value" + echo "include-raw-expand: Should be expanded: sample global param value" - echo "builder-with-params: Should be expanded: sample macro param value" + echo "builder-with-params: Should be expanded: sample macro param value" - echo "builder-with-params: Should be expanded: sample global param value" + echo "builder-with-params: Should be expanded: sample global param value" - echo "include-raw-expand: Should be expanded: sample global param value" + echo "include-raw-expand: Should be expanded: sample global param value" diff --git a/tests/yamlparser/job_fixtures/project-matrix001.xml b/tests/yamlparser/job_fixtures/project-matrix001.xml index 9407a730a..3b9c630fc 100644 --- a/tests/yamlparser/job_fixtures/project-matrix001.xml +++ b/tests/yamlparser/job_fixtures/project-matrix001.xml @@ -2,14 +2,14 @@ true - os == "fedora11" + os == "fedora11" UNSTABLE 1 YELLOW - !(os=="fedora11" && arch=="amd64") + !(os=="fedora11" && arch=="amd64") os diff --git a/tests/yamlparser/job_fixtures/project-matrix002.xml b/tests/yamlparser/job_fixtures/project-matrix002.xml index e9fe86303..b015b45df 100644 --- a/tests/yamlparser/job_fixtures/project-matrix002.xml +++ b/tests/yamlparser/job_fixtures/project-matrix002.xml @@ -2,7 +2,7 @@ false - os == "linux" + os == "linux" SUCCESS 0 diff --git a/tests/yamlparser/job_fixtures/project_flow_template001.xml b/tests/yamlparser/job_fixtures/project_flow_template001.xml index 33fd0bbee..6bee9b6eb 100644 --- a/tests/yamlparser/job_fixtures/project_flow_template001.xml +++ b/tests/yamlparser/job_fixtures/project_flow_template001.xml @@ -1,9 +1,9 @@ - build("job1") + build("job1") parallel ( - { build("job2a") }, - { build("job2b") } + { build("job2a") }, + { build("job2b") } ) false diff --git a/tests/yamlparser/job_fixtures/project_flow_template002.xml b/tests/yamlparser/job_fixtures/project_flow_template002.xml index 13b80d370..7f801427c 100644 --- a/tests/yamlparser/job_fixtures/project_flow_template002.xml +++ b/tests/yamlparser/job_fixtures/project_flow_template002.xml @@ -1,11 +1,11 @@ - build("job1") + build("job1") parallel ( - { build("job2a") }, - { build("job2b") } + { build("job2a") }, + { build("job2b") } ) -build("job2c") +build("job2c") false diff --git a/tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml b/tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml index d94b5b7f8..83622065a 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_concurrent.xml @@ -1,7 +1,7 @@ - false diff --git a/tests/yamlparser/job_fixtures/project_pipeline_template001.xml b/tests/yamlparser/job_fixtures/project_pipeline_template001.xml index 1921a332d..9f9cc29c9 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_template001.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_template001.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/project_pipeline_template002.xml b/tests/yamlparser/job_fixtures/project_pipeline_template002.xml index 82b941f0b..aa3108010 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_template002.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_template002.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/project_pipeline_template003.xml b/tests/yamlparser/job_fixtures/project_pipeline_template003.xml index 4992c5f95..78ed307c2 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_template003.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_template003.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/project_pipeline_template006.xml b/tests/yamlparser/job_fixtures/project_pipeline_template006.xml index 3db385db4..8716771b4 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_template006.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_template006.xml @@ -2,7 +2,7 @@ false diff --git a/tests/yamlparser/job_fixtures/project_pipeline_triggers.xml b/tests/yamlparser/job_fixtures/project_pipeline_triggers.xml index ed964de85..4e8060dc9 100644 --- a/tests/yamlparser/job_fixtures/project_pipeline_triggers.xml +++ b/tests/yamlparser/job_fixtures/project_pipeline_triggers.xml @@ -1,7 +1,7 @@ - false diff --git a/tests/yamlparser/job_fixtures/project_workflow_template001.xml b/tests/yamlparser/job_fixtures/project_workflow_template001.xml index f82dbe506..2710c1d37 100644 --- a/tests/yamlparser/job_fixtures/project_workflow_template001.xml +++ b/tests/yamlparser/job_fixtures/project_workflow_template001.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/project_workflow_template002.xml b/tests/yamlparser/job_fixtures/project_workflow_template002.xml index f92286df8..61e6ce0e6 100644 --- a/tests/yamlparser/job_fixtures/project_workflow_template002.xml +++ b/tests/yamlparser/job_fixtures/project_workflow_template002.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/project_workflow_template003.xml b/tests/yamlparser/job_fixtures/project_workflow_template003.xml index 8274d6a0f..10f1dea10 100644 --- a/tests/yamlparser/job_fixtures/project_workflow_template003.xml +++ b/tests/yamlparser/job_fixtures/project_workflow_template003.xml @@ -1,11 +1,11 @@ - diff --git a/tests/yamlparser/job_fixtures/regression-2006254.xml b/tests/yamlparser/job_fixtures/regression-2006254.xml index 6a39a6e6d..13440c01d 100644 --- a/tests/yamlparser/job_fixtures/regression-2006254.xml +++ b/tests/yamlparser/job_fixtures/regression-2006254.xml @@ -58,7 +58,7 @@ #!/bin/bash -IMG_NAME="gluster/glusterd2-nightly" +IMG_NAME="gluster/glusterd2-nightly" IMG_VERSION=$(date +%Y%m%d) @@ -75,9 +75,9 @@ make cp pkg/glusterfs/Dockerfile . buildah bud . -#if [ "$PUSH_TO_HUB" = true ]; then - #buildah push --authfile $AUTH_JSON "localhost/$IMG_NAME:$IMG_VERSION" "docker://docker.io/gluster/glusterd2-nightly:$IMG_VERSION" - #buildah push --authfile $AUTH_JSON "localhost/$IMG_NAME:$IMG_VERSION" "docker://docker.io/gluster/glusterd2-nightly:latest" +#if [ "$PUSH_TO_HUB" = true ]; then + #buildah push --authfile $AUTH_JSON "localhost/$IMG_NAME:$IMG_VERSION" "docker://docker.io/gluster/glusterd2-nightly:$IMG_VERSION" + #buildah push --authfile $AUTH_JSON "localhost/$IMG_NAME:$IMG_VERSION" "docker://docker.io/gluster/glusterd2-nightly:latest" #fi diff --git a/tests/yamlparser/job_fixtures/string_join.xml b/tests/yamlparser/job_fixtures/string_join.xml index 4faec0752..febf49274 100644 --- a/tests/yamlparser/job_fixtures/string_join.xml +++ b/tests/yamlparser/job_fixtures/string_join.xml @@ -26,9 +26,9 @@ - echo "Template name: string-join-data-{name}" -echo "Data to be processed:" -echo "${INPUT_DATA}" + echo "Template name: string-join-data-{name}" +echo "Data to be processed:" +echo "${INPUT_DATA}" @@ -64,9 +64,9 @@ echo "${INPUT_DATA}" - echo "Template name: string-join-data-{name}" -echo "Data to be processed:" -echo "${INPUT_DATA}" + echo "Template name: string-join-data-{name}" +echo "Data to be processed:" +echo "${INPUT_DATA}" diff --git a/tests/yamlparser/job_fixtures/template_default_variables.xml b/tests/yamlparser/job_fixtures/template_default_variables.xml index 52b3cf492..47202df77 100644 --- a/tests/yamlparser/job_fixtures/template_default_variables.xml +++ b/tests/yamlparser/job_fixtures/template_default_variables.xml @@ -12,8 +12,8 @@ - echo "Job Name: template-variable-defaults-1-periodic" -echo "Variable: Hello World" + echo "Job Name: template-variable-defaults-1-periodic" +echo "Variable: Hello World" @@ -34,8 +34,8 @@ echo "Variable: Hello World" - echo "Job Name: template-variable-defaults-2-periodic" -echo "Variable: Goodbye World" + echo "Job Name: template-variable-defaults-2-periodic" +echo "Variable: Goodbye World" diff --git a/tests/yamlparser/job_fixtures/template_honor_defaults_project_type.xml b/tests/yamlparser/job_fixtures/template_honor_defaults_project_type.xml index b6108c1e9..532d134db 100644 --- a/tests/yamlparser/job_fixtures/template_honor_defaults_project_type.xml +++ b/tests/yamlparser/job_fixtures/template_honor_defaults_project_type.xml @@ -1,7 +1,7 @@ - false diff --git a/tests/yamlparser/job_fixtures/template_ids.xml b/tests/yamlparser/job_fixtures/template_ids.xml index 02c970e2b..b38a40e16 100644 --- a/tests/yamlparser/job_fixtures/template_ids.xml +++ b/tests/yamlparser/job_fixtures/template_ids.xml @@ -11,9 +11,9 @@ - echo "Template name: template-test-ids-{num}-{type}" -echo "Job name: template-test-ids-1-periodic" -echo "Hello World" + echo "Template name: template-test-ids-{num}-{type}" +echo "Job name: template-test-ids-1-periodic" +echo "Hello World" @@ -34,12 +34,12 @@ echo "Hello World" - echo "Template name: template-test-ids-{num}-{type}" -echo "Job name: template-test-ids-2-canary" + echo "Template name: template-test-ids-{num}-{type}" +echo "Job name: template-test-ids-2-canary" - echo "Goodbye World" + echo "Goodbye World" diff --git a/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml index 03996fee8..b45ee251d 100644 --- a/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml +++ b/tests/yamlparser/job_fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml @@ -13,7 +13,7 @@ #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") @@ -93,7 +93,7 @@ print("Doing something cool with python") #!/usr/bin/env python # -print("Doing something cool with python") +print("Doing something cool with python") diff --git a/tests/yamlparser/job_fixtures/unicode001.xml b/tests/yamlparser/job_fixtures/unicode001.xml index 1c91ed6d5..8622f6ab5 100644 --- a/tests/yamlparser/job_fixtures/unicode001.xml +++ b/tests/yamlparser/job_fixtures/unicode001.xml @@ -16,7 +16,7 @@ #!/bin/bash -echo "Unicode! ☃" +echo "Unicode! ☃" diff --git a/tests/yamlparser/job_fixtures/variable_default_values.xml b/tests/yamlparser/job_fixtures/variable_default_values.xml index 61119939c..6531fd09b 100644 --- a/tests/yamlparser/job_fixtures/variable_default_values.xml +++ b/tests/yamlparser/job_fixtures/variable_default_values.xml @@ -72,10 +72,10 @@ - echo "{defined_var|+1}" -echo "{defined_var|-1}" -echo "{undefined_var|+1}" -echo "{undefined_var|-1}" + echo "{defined_var|+1}" +echo "{defined_var|-1}" +echo "{undefined_var|+1}" +echo "{undefined_var|-1}" diff --git a/tests/yamlparser/job_fixtures/variable_escaping.xml b/tests/yamlparser/job_fixtures/variable_escaping.xml index 16a37dd29..f605643a3 100644 --- a/tests/yamlparser/job_fixtures/variable_escaping.xml +++ b/tests/yamlparser/job_fixtures/variable_escaping.xml @@ -11,10 +11,10 @@ - echo "{var}" -echo "{defined_var|def}" -echo "{undefined_var|def}" -echo "{undefined_var|defined_var}" + echo "{var}" +echo "{defined_var|def}" +echo "{undefined_var|def}" +echo "{undefined_var|defined_var}"