diff options
| author | Thomas Bechtold <tbechtold@suse.com> | 2016-10-18 07:56:57 +0200 |
|---|---|---|
| committer | Bertrand Roussel <broussel@sierrawireless.com> | 2018-01-09 09:02:29 -0800 |
| commit | ecf3933dc2ce6d0eeca3e73946f62fbec606a36d (patch) | |
| tree | 5d26c686e2c0babf515e4e34940787298e341a03 /tests/yamlparser/fixtures/complete001.xml | |
| parent | 0b5ed0345a1aaba5c6502fedd6259932c78d750d (diff) | |
| download | python-jenkins-job-builder-ecf3933dc2ce6d0eeca3e73946f62fbec606a36d.tar.gz python-jenkins-job-builder-ecf3933dc2ce6d0eeca3e73946f62fbec606a36d.tar.xz python-jenkins-job-builder-ecf3933dc2ce6d0eeca3e73946f62fbec606a36d.zip | |
Fix timeout wrapper version detection
If, for whatever reason, the version of the build-timeout
plugin can not be detected, assume that we use a newer version (>= 1.14).
Version 1.14 is already ~ 2 1/2 years old so this is a sane assumption.
Also adjust fixtures to use the newer plugin version xml output.
Change-Id: I86295933d0c3247f55d0114473fc9c8f8feb7441
Signed-off-by: Bertrand Roussel <broussel@sierrawireless.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Diffstat (limited to 'tests/yamlparser/fixtures/complete001.xml')
| -rw-r--r-- | tests/yamlparser/fixtures/complete001.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml index c34f622f..452cd086 100644 --- a/tests/yamlparser/fixtures/complete001.xml +++ b/tests/yamlparser/fixtures/complete001.xml @@ -112,12 +112,14 @@ print("Doing something cool with python") <publishers/> <buildWrappers> <hudson.plugins.build__timeout.BuildTimeoutWrapper> - <timeoutMinutes>3</timeoutMinutes> - <failBuild>true</failBuild> - <writingDescription>false</writingDescription> - <timeoutPercentage>150</timeoutPercentage> - <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault> - <timeoutType>elastic</timeoutType> + <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy"> + <timeoutPercentage>150</timeoutPercentage> + <numberOfBuilds>0</numberOfBuilds> + <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault> + </strategy> + <operationList> + <hudson.plugins.build__timeout.operations.FailOperation/> + </operationList> </hudson.plugins.build__timeout.BuildTimeoutWrapper> <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper> <buildSteps> |