Merge remote-tracking branch 'origin/master'

Conflicts: src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java src/test/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplateTest.java
jenkinsci · Jan 31, 2014 · 9ee4a37 · 9ee4a37
2 parents 59492bf + 926679d
commit 9ee4a37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/main/resources/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate/config.jelly b/src/main/resources/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate/config.jelly
@@ -39,18 +39,28 @@
     </f:section>
 
     <f:section title="Image/OS Options">
-      <f:radioBlock inline="true" name="jclouds.useImageId" value="true"
-                    title="Specify Image ID" checked="${instance.imageId != ''}">
+      <f:radioBlock inline="true" name="jclouds.imageSelectionOption" value="imageId"
+                    title="Specify Image ID" checked="${(instance.imageId != null) &amp;&amp; !instance.imageId.isEmpty()}">
         <f:entry title="Image Id" field="imageId">
           <f:textbox />
         </f:entry>
 
         <f:validateButton title="${%Check Image Id}" progress="${%Checking...}" method="validateImageId"
                           with="providerName,identity,credential,endPointUrl,imageId"/>
       </f:radioBlock>
-
-      <f:radioBlock inline="true" name="jclouds.useImageId" value="false"
-                    title="Specify OS Family and Version" checked="${instance.imageId == ''}">
+
+      <f:radioBlock inline="true" name="jclouds.imageSelectionOption" value="imageNameRegex"
+                    title="Specify Image Name Regex" checked="${((instance.imageId == null) || instance.imageId.isEmpty()) &amp;&amp; (instance.imageNameRegex != null) &amp;&amp; !instance.imageNameRegex.isEmpty()}">
+        <f:entry title="Image Name Regex" field="imageNameRegex">
+            <f:textbox />
+        </f:entry>
+
+        <f:validateButton title="${%Check Image Name Regex}" progress="${%Checking...}" method="validateImageNameRegex"
+                          with="providerName,identity,credential,endPointUrl,imageNameRegex"/>
+      </f:radioBlock>
+
+      <f:radioBlock inline="true" name="jclouds.imageSelectionOption" value="osFamilyAndVersion"
+                    title="Specify OS Family and Version" checked="${((instance.imageId == null) || instance.imageId.isEmpty()) &amp;&amp; ((instance.imageNameRegex == null) || instance.imageNameRegex.isEmpty())}">
         <f:entry title="OS Family" field="osFamily">
           <f:textbox/>
         </f:entry>

diff --git a/...n/resources/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate/help-imageNameRegex.html b/...n/resources/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate/help-imageNameRegex.html
@@ -0,0 +1,3 @@
+<div>
+  Regular expression to be used to select images by name. See <a href="http://docs.oracle.com/javase/tutorial/essential/regex/">docs</a> for more details.
+</div>