Merge pull request #320 from aries1980/t3-instance-support

JENKINS-54536 - T3 instance type class support
jenkinsci · Dec 18, 2018 · 495adac · 495adac
2 parents 448bbf5 + c9986cf
commit 495adac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@ THE SOFTWARE.
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>aws-java-sdk</artifactId>
-            <version>1.11.403</version>
+            <version>1.11.457</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java b/src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java
@@ -194,6 +194,12 @@ public EC2Cloud getCloud() {
             return 2;
         case M3Medium:
             return 2;
+        case T3Small:
+            return 2;
+        case T3Medium:
+            return 2;
+        case T3Large:
+            return 3;
         case M1Large:
             return 4;
         case M3Large:
@@ -202,6 +208,8 @@ public EC2Cloud getCloud() {
             return 4;
         case M5Large:
             return 4;
+        case T3Xlarge:
+            return 5;
         case C1Medium:
             return 5;
         case M2Xlarge:
@@ -216,6 +224,8 @@ public EC2Cloud getCloud() {
             return 7;
         case M1Xlarge:
             return 8;
+        case T32xlarge:
+            return 10;
         case M22xlarge:
             return 13;
         case M3Xlarge: