From 720563a7cd018363b77e7b382c053dcc5fdd1762 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 12:45:48 +0000
Subject: [PATCH 1/2] Update dependency io.jenkins.tools.bom:bom-2.479.x to
v4583
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bfe2b22995..0b12407ba6 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
From 91ef09b4e6cd7eb2518a25c99e5f4606e9b6b814 Mon Sep 17 00:00:00 2001
From: Basil Crow
Date: Wed, 9 Apr 2025 09:35:04 -0700
Subject: [PATCH 2/2] Adapt to EC2 changes
---
demos/ec2/README.md | 4 ++--
.../src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java | 6 +++---
.../src/test/resources/io/jenkins/plugins/casc/alias1.yml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/demos/ec2/README.md b/demos/ec2/README.md
index 3c8eaeca1e..ed98a29b65 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 4d608e51e1..8b244f5bf9 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.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 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 void configure_ec2_cloud() {
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 void configure_ec2_cloud() {
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 5fe0f9a13c..b5136840b5 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