diff --git a/demos/ec2/README.md b/demos/ec2/README.md index 3c8eaeca..ed98a29b 100644 --- a/demos/ec2/README.md +++ b/demos/ec2/README.md @@ -44,11 +44,11 @@ jenkins: region: "eu-central-1" templates: - description: "Auto configured EC2 Agent Small" - type: "T2Small" + type: "t2.small" labelString: "Small" <<: *ec2_anchor - description: "Auto configured EC2 Agent Large" - type: "T2Xlarge" + type: "t2.xlarge" labelString: "Large" <<: *ec2_anchor ``` diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java index 4d608e51..8b244f5b 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java @@ -10,7 +10,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.amazonaws.services.ec2.model.InstanceType; import hudson.model.labels.LabelAtom; import hudson.plugins.ec2.AMITypeData; import hudson.plugins.ec2.EC2Cloud; @@ -22,6 +21,7 @@ import java.util.List; import jenkins.model.Jenkins; import org.junit.Rule; import org.junit.Test; +import software.amazon.awssdk.services.ec2.model.InstanceType; public class EC2CloudTest { @@ -48,7 +48,7 @@ public class EC2CloudTest { assertFalse(slaveTemplate.monitoring); assertFalse(slaveTemplate.stopOnTerminate); assertFalse(slaveTemplate.useEphemeralDevices); - assertThat(slaveTemplate.type, is(InstanceType.T2Small)); + assertThat(slaveTemplate.type, is(InstanceType.T2_SMALL.toString())); assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3")); assertThat(slaveTemplate.getLabelString(), containsString("Small")); assertThat(slaveTemplate.getLabelSet(), is(notNullValue())); @@ -78,7 +78,7 @@ public class EC2CloudTest { assertFalse(slaveTemplate.monitoring); assertFalse(slaveTemplate.stopOnTerminate); assertFalse(slaveTemplate.useEphemeralDevices); - assertThat(slaveTemplate.type, is(InstanceType.T2Xlarge)); + assertThat(slaveTemplate.type, is(InstanceType.T2_XLARGE.toString())); assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3")); assertThat(slaveTemplate.getLabelString(), containsString("Large")); assertThat(slaveTemplate.getLabelSet(), is(notNullValue())); diff --git a/integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml b/integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml index 5fe0f9a1..b5136840 100644 --- a/integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml +++ b/integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml @@ -37,10 +37,10 @@ jenkins: region: "eu-central-1" templates: - description: "Auto configured EC2 Agent Small" - type: "T2Small" + type: "t2.small" labelString: "Small" <<: *ec2_anchor - description: "Auto configured EC2 Agent Large" - type: "T2Xlarge" + type: "t2.xlarge" labelString: "Large" <<: *ec2_anchor diff --git a/pom.xml b/pom.xml index bfe2b229..0b12407b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ ${jenkins.baseline}.3 configuration-as-code-@{project.version} true - 4488.v7fe26526366e + 4583.v0a_f4df179fa_b_ false