JENKINS-32588 Unable to launch linux slaves using ec2 plugin using Eu…

…calyptus
jenkinsci · Jan 31, 2016 · 2d34798 · 2d34798
1 parent 781b391
commit 2d34798
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/EC2Cloud.java b/src/main/java/hudson/plugins/ec2/EC2Cloud.java
@@ -291,15 +291,19 @@ private int countCurrentEC2Slaves(SlaveTemplate template) throws AmazonClientExc
             }
         }
         List<SpotInstanceRequest> sirs;
-        DescribeSpotInstanceRequestsRequest dsir = new DescribeSpotInstanceRequestsRequest();
+        List<Filter> filters = new ArrayList<Filter>();
+        List<String> values;
         if (template != null) {
-            List<Filter> filters = new ArrayList<Filter>();
-            List<String> values = new ArrayList<String>();
+            values = new ArrayList<String>();
             values.add(template.getAmi());
             filters.add(new Filter("launch.image-id", values));
-            dsir = dsir.withFilters(filters);
         }
 
+        values = new ArrayList<String>();
+        values.add(EC2Tag.TAG_NAME_JENKINS_SLAVE_TYPE);
+        filters.add(new Filter("tag-key", values));
+
+        DescribeSpotInstanceRequestsRequest dsir = new DescribeSpotInstanceRequestsRequest().withFilters(filters);
         sirs = connect().describeSpotInstanceRequests(dsir).getSpotInstanceRequests();
         Set<SpotInstanceRequest> sirSet = new HashSet();