Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump aws-java-sdk to pick up c5d and m5d instance types #280

Merged
merged 3 commits into from
Jun 6, 2018
Merged

Bump aws-java-sdk to pick up c5d and m5d instance types #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e770b0
Bump aws-java-sdk to pick up c5d instance types
May 18, 2018
2cd4954
Use 1.11.239 version
May 28, 2018
9dc44a4
Bump aws-java-sdk plugin version
Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ public EC2Cloud getCloud() {
return 7;
case C5Large:
return 7;
case C5dLarge:
return 7;
case M1Xlarge:
return 8;
case M22xlarge:
Expand All @@ -215,6 +217,8 @@ public EC2Cloud getCloud() {
return 14;
case C5Xlarge:
return 14;
case C5dXlarge:
return 14;
case C1Xlarge:
return 20;
case M24xlarge:
Expand All @@ -231,6 +235,8 @@ public EC2Cloud getCloud() {
return 28;
case C52xlarge:
return 28;
case C5d2xlarge:
return 28;
case Cc14xlarge:
return 33;
case Cg14xlarge:
Expand All @@ -245,6 +251,8 @@ public EC2Cloud getCloud() {
return 55;
case C54xlarge:
return 55;
case C5d4xlarge:
return 55;
case M44xlarge:
return 55;
case Cc28xlarge:
Expand All @@ -257,11 +265,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