diff options
Diffstat (limited to 'tests')
11 files changed, 33 insertions, 41 deletions
diff --git a/tests/publishers/fixtures/workspace-cleanup-full.xml b/tests/publishers/fixtures/workspace-cleanup-full.xml index d5563863..ebe438e9 100644 --- a/tests/publishers/fixtures/workspace-cleanup-full.xml +++ b/tests/publishers/fixtures/workspace-cleanup-full.xml @@ -15,6 +15,7 @@ <deleteDirs>true</deleteDirs> <cleanupMatrixParent>true</cleanupMatrixParent> <externalDelete>command</externalDelete> + <disableDeferredWipeout>true</disableDeferredWipeout> <cleanWhenSuccess>false</cleanWhenSuccess> <cleanWhenUnstable>false</cleanWhenUnstable> <cleanWhenFailure>false</cleanWhenFailure> diff --git a/tests/publishers/fixtures/workspace-cleanup-full.yaml b/tests/publishers/fixtures/workspace-cleanup-full.yaml index 1ea41495..0f5f5e52 100644 --- a/tests/publishers/fixtures/workspace-cleanup-full.yaml +++ b/tests/publishers/fixtures/workspace-cleanup-full.yaml @@ -14,3 +14,4 @@ publishers: fail-build: false clean-parent: true external-deletion-command: 'command' + disable-deferred-wipeout: true diff --git a/tests/publishers/fixtures/workspace-cleanup-minimal.xml b/tests/publishers/fixtures/workspace-cleanup-minimal.xml index 36f0e03e..d264147d 100644 --- a/tests/publishers/fixtures/workspace-cleanup-minimal.xml +++ b/tests/publishers/fixtures/workspace-cleanup-minimal.xml @@ -5,6 +5,7 @@ <deleteDirs>false</deleteDirs> <cleanupMatrixParent>false</cleanupMatrixParent> <externalDelete/> + <disableDeferredWipeout>false</disableDeferredWipeout> <cleanWhenSuccess>true</cleanWhenSuccess> <cleanWhenUnstable>true</cleanWhenUnstable> <cleanWhenFailure>true</cleanWhenFailure> diff --git a/tests/triggers/fixtures/rabbitmq-filters.xml b/tests/triggers/fixtures/rabbitmq-filters.xml new file mode 100644 index 00000000..db1c0bff --- /dev/null +++ b/tests/triggers/fixtures/rabbitmq-filters.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <triggers class="vector"> + <org.jenkinsci.plugins.rabbitmqbuildtrigger.RemoteBuildTrigger> + <filters> + <org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter> + <field>field1</field> + <value>value1</value> + </org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter> + <org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter> + <field>field2</field> + <value>value2</value> + </org.jenkinsci.plugins.rabbitmqbuildtrigger.Filter> + </filters> + <spec/> + <remoteBuildToken>build_trigger_token</remoteBuildToken> + </org.jenkinsci.plugins.rabbitmqbuildtrigger.RemoteBuildTrigger> + </triggers> +</project> diff --git a/tests/triggers/fixtures/rabbitmq-filters.yaml b/tests/triggers/fixtures/rabbitmq-filters.yaml new file mode 100644 index 00000000..bfcdfa99 --- /dev/null +++ b/tests/triggers/fixtures/rabbitmq-filters.yaml @@ -0,0 +1,8 @@ +triggers: + - rabbitmq: + token: 'build_trigger_token' + filters: + - field: 'field1' + value: 'value1' + - field: 'field2' + value: 'value2' diff --git a/tests/wrappers/fixtures/workspace-cleanup-full.xml b/tests/wrappers/fixtures/workspace-cleanup-full.xml index 06b9e11b..22f72f23 100644 --- a/tests/wrappers/fixtures/workspace-cleanup-full.xml +++ b/tests/wrappers/fixtures/workspace-cleanup-full.xml @@ -15,6 +15,7 @@ <deleteDirs>true</deleteDirs> <cleanupParameter>DO_WS_CLEANUP</cleanupParameter> <externalDelete>shred -u %s</externalDelete> + <disableDeferredWipeout>true</disableDeferredWipeout> </hudson.plugins.ws__cleanup.PreBuildCleanup> </buildWrappers> </project> diff --git a/tests/wrappers/fixtures/workspace-cleanup-full.yaml b/tests/wrappers/fixtures/workspace-cleanup-full.yaml index 4ec97cbd..94b66223 100644 --- a/tests/wrappers/fixtures/workspace-cleanup-full.yaml +++ b/tests/wrappers/fixtures/workspace-cleanup-full.yaml @@ -7,3 +7,4 @@ wrappers: dirmatch: true check-parameter: "DO_WS_CLEANUP" external-deletion-command: "shred -u %s" + disable-deferred-wipeout: true diff --git a/tests/wrappers/fixtures/workspace-cleanup-min.xml b/tests/wrappers/fixtures/workspace-cleanup-min.xml index 309a65be..eaecd5d8 100644 --- a/tests/wrappers/fixtures/workspace-cleanup-min.xml +++ b/tests/wrappers/fixtures/workspace-cleanup-min.xml @@ -5,6 +5,7 @@ <deleteDirs>false</deleteDirs> <cleanupParameter/> <externalDelete/> + <disableDeferredWipeout>false</disableDeferredWipeout> </hudson.plugins.ws__cleanup.PreBuildCleanup> </buildWrappers> </project> diff --git a/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml b/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml deleted file mode 100644 index 732bb2c4..00000000 --- a/tests/yamlparser/fixtures/jinja-as-yaml-include01.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<project> - <actions/> - <description><!-- Managed by Jenkins Job Builder --></description> - <keepDependencies>false</keepDependencies> - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> - <concurrentBuild>false</concurrentBuild> - <canRoam>true</canRoam> - <properties> - <hudson.model.ParametersDefinitionProperty> - <parameterDefinitions> - <hudson.model.ChoiceParameterDefinition> - <name>TEST_CHOICE</name> - <description/> - <choices class="java.util.Arrays$ArrayList"> - <a class="string-array"> - <string>a</string> - <string>b</string> - <string>c</string> - </a> - </choices> - </hudson.model.ChoiceParameterDefinition> - </parameterDefinitions> - </hudson.model.ParametersDefinitionProperty> - </properties> - <scm class="hudson.scm.NullSCM"/> - <builders/> - <publishers/> - <buildWrappers/> -</project> diff --git a/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml b/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml deleted file mode 100644 index 2ea430f0..00000000 --- a/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- job: - name: test-job-as-yaml - parameters: - - choice: - name: TEST_CHOICE - choices: - !include-jinja2-as-yaml: jinja-as-yaml-include01.yaml.inc diff --git a/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc b/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc deleted file mode 100644 index c1c3c8b3..00000000 --- a/tests/yamlparser/fixtures/jinja-as-yaml-include01.yaml.inc +++ /dev/null @@ -1,3 +0,0 @@ -{% for item in ['a', 'b', 'c'] %} -- {{ item }} -{% endfor -%} |