diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-08 20:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-08 20:55:26 +0000 |
| commit | ed07d8fa94043040ebf307bce5d17fdb59c9f10a (patch) | |
| tree | c7a2a472ab54a3a3e77c9fcbb9c954da4ab7e99a /tests/yamlparser/fixtures | |
| parent | 308aec601e7d99eb0c7b01219c255206b3c90f35 (diff) | |
| parent | ecf3933dc2ce6d0eeca3e73946f62fbec606a36d (diff) | |
| download | python-jenkins-job-builder-ed07d8fa94043040ebf307bce5d17fdb59c9f10a.tar.gz python-jenkins-job-builder-ed07d8fa94043040ebf307bce5d17fdb59c9f10a.tar.xz python-jenkins-job-builder-ed07d8fa94043040ebf307bce5d17fdb59c9f10a.zip | |
Merge "Fix timeout wrapper version detection"
Diffstat (limited to 'tests/yamlparser/fixtures')
| -rw-r--r-- | tests/yamlparser/fixtures/complete001.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-raw001.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include001.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/lazy-load-jobs001.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/lazy-load-jobs002.xml | 14 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/yaml_anchor.xml | 12 |
7 files changed, 54 insertions, 42 deletions
diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml index f6c5192d..546fd5e6 100644 --- a/tests/yamlparser/fixtures/complete001.xml +++ b/tests/yamlparser/fixtures/complete001.xml @@ -114,12 +114,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> diff --git a/tests/yamlparser/fixtures/include-raw001.xml b/tests/yamlparser/fixtures/include-raw001.xml index 494410c5..7ec205f1 100644 --- a/tests/yamlparser/fixtures/include-raw001.xml +++ b/tests/yamlparser/fixtures/include-raw001.xml @@ -23,12 +23,14 @@ <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> diff --git a/tests/yamlparser/fixtures/include001.xml b/tests/yamlparser/fixtures/include001.xml index 640c3edb..ec833ab2 100644 --- a/tests/yamlparser/fixtures/include001.xml +++ b/tests/yamlparser/fixtures/include001.xml @@ -23,12 +23,14 @@ <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> diff --git a/tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml b/tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml index 2df35f29..4d0d39bf 100644 --- a/tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml +++ b/tests/yamlparser/fixtures/lazy-load-jobs-multi001.xml @@ -33,12 +33,14 @@ echo "Doing somethiung cool" <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> </buildWrappers> </project> diff --git a/tests/yamlparser/fixtures/lazy-load-jobs001.xml b/tests/yamlparser/fixtures/lazy-load-jobs001.xml index 62a32bfe..bc6d7aeb 100644 --- a/tests/yamlparser/fixtures/lazy-load-jobs001.xml +++ b/tests/yamlparser/fixtures/lazy-load-jobs001.xml @@ -30,12 +30,14 @@ VERSION="1.1" <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> </buildWrappers> </project> diff --git a/tests/yamlparser/fixtures/lazy-load-jobs002.xml b/tests/yamlparser/fixtures/lazy-load-jobs002.xml index 446e1dc1..b44a0154 100644 --- a/tests/yamlparser/fixtures/lazy-load-jobs002.xml +++ b/tests/yamlparser/fixtures/lazy-load-jobs002.xml @@ -30,12 +30,14 @@ VERSION="1.2" <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> diff --git a/tests/yamlparser/fixtures/yaml_anchor.xml b/tests/yamlparser/fixtures/yaml_anchor.xml index 65868964..9d18713d 100644 --- a/tests/yamlparser/fixtures/yaml_anchor.xml +++ b/tests/yamlparser/fixtures/yaml_anchor.xml @@ -13,12 +13,12 @@ <publishers/> <buildWrappers> <hudson.plugins.build__timeout.BuildTimeoutWrapper> - <timeoutMinutes>180</timeoutMinutes> - <failBuild>true</failBuild> - <writingDescription>false</writingDescription> - <timeoutPercentage>0</timeoutPercentage> - <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault> - <timeoutType>absolute</timeoutType> + <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy"> + <timeoutMinutes>180</timeoutMinutes> + </strategy> + <operationList> + <hudson.plugins.build__timeout.operations.FailOperation/> + </operationList> </hudson.plugins.build__timeout.BuildTimeoutWrapper> <hudson.plugins.timestamper.TimestamperBuildWrapper/> </buildWrappers> |