Merge "Fix timeout wrapper version detection"

jenkins_jobs/modules/wrappers.py

@@ -311,14 +311,19 @@ def timeout(registry, xml_parent, data):
     prefix = 'hudson.plugins.build__timeout.'
     twrapper = XML.SubElement(xml_parent, prefix + 'BuildTimeoutWrapper')
 
-    plugin_info = registry.get_plugin_info(
+    plugin_info = registry.get_plugin_info("Build Timeout")
-        "Jenkins build timeout plugin")
+    if "version" not in plugin_info:
-    version = pkg_resources.parse_version(plugin_info.get("version", "0"))
+        plugin_info = registry.get_plugin_info("Jenkins build timeout plugin")
+    version = plugin_info.get("version", None)
+    if version:
+        version = pkg_resources.parse_version(version)
 
     valid_strategies = ['absolute', 'no-activity', 'likely-stuck', 'elastic',
                         'deadline']
 
-    if version >= pkg_resources.parse_version("1.14"):
+    # NOTE(toabctl): if we don't know the version assume that we
+    # use a newer version of the plugin
+    if not version or version >= pkg_resources.parse_version("1.14"):
         strategy = data.get('type', 'absolute')
         if strategy not in valid_strategies:
             InvalidAttributeError('type', strategy, valid_strategies)

tests/jsonparser/fixtures/complete001.xml

@@ -110,12 +110,14 @@ print("Doing something cool with python")
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
       <buildSteps>

tests/wrappers/fixtures/timeout/timeout001.xml

@@ -2,13 +2,13 @@
 <project>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>90</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
+        <timeoutMinutes>90</timeoutMinutes>
+      </strategy>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
       <timeoutEnvVar>BUILD_TIMEOUT</timeoutEnvVar>
-      <failBuild>true</failBuild>
-      <writingDescription>false</writingDescription>
-      <timeoutPercentage>0</timeoutPercentage>
-      <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
-      <timeoutType>absolute</timeoutType>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
   </buildWrappers>
 </project>

tests/wrappers/fixtures/timeout/timeout002.xml

@@ -2,12 +2,12 @@
 <project>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.LikelyStuckTimeOutStrategy">
-      <failBuild>false</failBuild>
+        <timeoutMinutes>3</timeoutMinutes>
-      <writingDescription>false</writingDescription>
+      </strategy>
-      <timeoutPercentage>0</timeoutPercentage>
+      <operationList>
-      <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
+        <hudson.plugins.build__timeout.operations.AbortOperation/>
-      <timeoutType>likelyStuck</timeoutType>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
   </buildWrappers>
-</project>
+</project>

tests/wrappers/fixtures/timeout/timeout003.xml

@@ -2,13 +2,15 @@
 <project>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <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>
       <timeoutEnvVar>BUILD_TIMEOUT</timeoutEnvVar>
-      <failBuild>true</failBuild>
-      <writingDescription>false</writingDescription>
-      <timeoutPercentage>150</timeoutPercentage>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutType>elastic</timeoutType>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
   </buildWrappers>
 </project>

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>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
       <buildSteps>

tests/yamlparser/fixtures/include-raw001.xml

@@ -23,12 +23,14 @@
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
       <buildSteps>

tests/yamlparser/fixtures/include001.xml

@@ -23,12 +23,14 @@
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
       <buildSteps>

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>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
   </buildWrappers>
 </project>

tests/yamlparser/fixtures/lazy-load-jobs001.xml

@@ -30,12 +30,14 @@ VERSION="1.1"
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
   </buildWrappers>
 </project>

tests/yamlparser/fixtures/lazy-load-jobs002.xml

@@ -30,12 +30,14 @@ VERSION="1.2"
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>3</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.ElasticTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutPercentage>150</timeoutPercentage>
-      <writingDescription>false</writingDescription>
+        <numberOfBuilds>0</numberOfBuilds>
-      <timeoutPercentage>150</timeoutPercentage>
+        <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
-      <timeoutMinutesElasticDefault>90</timeoutMinutesElasticDefault>
+      </strategy>
-      <timeoutType>elastic</timeoutType>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <org.jenkinsci.plugins.preSCMbuildstep.PreSCMBuildStepsWrapper>
       <buildSteps>

tests/yamlparser/fixtures/yaml_anchor.xml

@@ -13,12 +13,12 @@
   <publishers/>
   <buildWrappers>
     <hudson.plugins.build__timeout.BuildTimeoutWrapper>
-      <timeoutMinutes>180</timeoutMinutes>
+      <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
-      <failBuild>true</failBuild>
+        <timeoutMinutes>180</timeoutMinutes>
-      <writingDescription>false</writingDescription>
+      </strategy>
-      <timeoutPercentage>0</timeoutPercentage>
+      <operationList>
-      <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
-      <timeoutType>absolute</timeoutType>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <hudson.plugins.timestamper.TimestamperBuildWrapper/>
   </buildWrappers>