Skip to content

Commit

Permalink
Bump aws-java-sdk to pick up c5d and m5d instance types (jenkinsci#280)
Browse files Browse the repository at this point in the history
* Bump aws-java-sdk to pick up c5d instance types

* Use 1.11.239 version

* Bump aws-java-sdk plugin version
  • Loading branch information
artms authored and GavrielNsof committed Oct 3, 2018
1 parent ea3fdc2 commit 62958a4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.264</version>
<version>1.11.341</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/hudson/plugins/ec2/EC2AbstractSlave.java
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ public EC2Cloud getCloud() {
return 7;
case C5Large:
return 7;
case C5dLarge:
return 7;
case M1Xlarge:
return 8;
case M22xlarge:
Expand All @@ -217,6 +219,8 @@ public EC2Cloud getCloud() {
return 14;
case C5Xlarge:
return 14;
case C5dXlarge:
return 14;
case C1Xlarge:
return 20;
case M24xlarge:
Expand All @@ -233,6 +237,8 @@ public EC2Cloud getCloud() {
return 28;
case C52xlarge:
return 28;
case C5d2xlarge:
return 28;
case Cc14xlarge:
return 33;
case Cg14xlarge:
Expand All @@ -247,6 +253,8 @@ public EC2Cloud getCloud() {
return 55;
case C54xlarge:
return 55;
case C5d4xlarge:
return 55;
case M44xlarge:
return 55;
case Cc28xlarge:
Expand All @@ -259,11 +267,15 @@ public EC2Cloud getCloud() {
return 108;
case C59xlarge:
return 108;
case C5d9xlarge:
return 108;
case M410xlarge:
return 120;
// TODO: M416xlarge
case C518xlarge:
return 216;
case C5d18xlarge:
return 216;
// We don't have a suggestion, but we don't want to fail completely
// surely?
default:
Expand Down

0 comments on commit 62958a4

Please sign in to comment.