Skip to content

Commit e6cb90c

Browse files
renovate[bot]basil
andauthored
Update dependency io.jenkins.tools.bom:bom-2.479.x to v4583 (#2656)
* Update dependency io.jenkins.tools.bom:bom-2.479.x to v4583 * Adapt to EC2 changes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Basil Crow <me@basilcrow.com>
1 parent 148f87d commit e6cb90c

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

demos/ec2/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ jenkins:
4444
region: "eu-central-1"
4545
templates:
4646
- description: "Auto configured EC2 Agent Small"
47-
type: "T2Small"
47+
type: "t2.small"
4848
labelString: "Small"
4949
<<: *ec2_anchor
5050
- description: "Auto configured EC2 Agent Large"
51-
type: "T2Xlarge"
51+
type: "t2.xlarge"
5252
labelString: "Large"
5353
<<: *ec2_anchor
5454
```

integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import static org.junit.Assert.assertNotNull;
1111
import static org.junit.Assert.assertTrue;
1212

13-
import com.amazonaws.services.ec2.model.InstanceType;
1413
import hudson.model.labels.LabelAtom;
1514
import hudson.plugins.ec2.AMITypeData;
1615
import hudson.plugins.ec2.EC2Cloud;
@@ -22,6 +21,7 @@
2221
import jenkins.model.Jenkins;
2322
import org.junit.Rule;
2423
import org.junit.Test;
24+
import software.amazon.awssdk.services.ec2.model.InstanceType;
2525

2626
public class EC2CloudTest {
2727

@@ -48,7 +48,7 @@ public void configure_ec2_cloud() {
4848
assertFalse(slaveTemplate.monitoring);
4949
assertFalse(slaveTemplate.stopOnTerminate);
5050
assertFalse(slaveTemplate.useEphemeralDevices);
51-
assertThat(slaveTemplate.type, is(InstanceType.T2Small));
51+
assertThat(slaveTemplate.type, is(InstanceType.T2_SMALL.toString()));
5252
assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
5353
assertThat(slaveTemplate.getLabelString(), containsString("Small"));
5454
assertThat(slaveTemplate.getLabelSet(), is(notNullValue()));
@@ -78,7 +78,7 @@ public void configure_ec2_cloud() {
7878
assertFalse(slaveTemplate.monitoring);
7979
assertFalse(slaveTemplate.stopOnTerminate);
8080
assertFalse(slaveTemplate.useEphemeralDevices);
81-
assertThat(slaveTemplate.type, is(InstanceType.T2Xlarge));
81+
assertThat(slaveTemplate.type, is(InstanceType.T2_XLARGE.toString()));
8282
assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
8383
assertThat(slaveTemplate.getLabelString(), containsString("Large"));
8484
assertThat(slaveTemplate.getLabelSet(), is(notNullValue()));

integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jenkins:
3737
region: "eu-central-1"
3838
templates:
3939
- description: "Auto configured EC2 Agent Small"
40-
type: "T2Small"
40+
type: "t2.small"
4141
labelString: "Small"
4242
<<: *ec2_anchor
4343
- description: "Auto configured EC2 Agent Large"
44-
type: "T2Xlarge"
44+
type: "t2.xlarge"
4545
labelString: "Large"
4646
<<: *ec2_anchor

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
4444
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
4545
<useBeta>true</useBeta>
46-
<plugin-bom.version>4488.v7fe26526366e</plugin-bom.version>
46+
<plugin-bom.version>4583.v0a_f4df179fa_b_</plugin-bom.version>
4747
<spotless.check.skip>false</spotless.check.skip>
4848
</properties>
4949

0 commit comments

Comments
 (0)