Skip to content

Update dependency io.jenkins.tools.bom:bom-2.479.x to v4583 #2656

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

Merged
renovate merged 2 commits into from
Apr 9, 2025
Merged

Update dependency io.jenkins.tools.bom:bom-2.479.x to v4583 #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
720563a
Update dependency io.jenkins.tools.bom:bom-2.479.x to v4583
renovate[bot] Apr 9, 2025
91ef09b
Adapt to EC2 changes
basil Apr 9, 2025
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
4 changes: 2 additions & 2 deletions demos/ec2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
6 changes: 3 additions & 3 deletions integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand All @@ -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()));
Expand Down Expand Up @@ -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()));
Expand Down
4 changes: 2 additions & 2 deletions integrations/src/test/resources/io/jenkins/plugins/casc/alias1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -43,7 +43,7 @@
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
<useBeta>true</useBeta>
<plugin-bom.version>4488.v7fe26526366e</plugin-bom.version>
<plugin-bom.version>4583.v0a_f4df179fa_b_</plugin-bom.version>
<spotless.check.skip>false</spotless.check.skip>
</properties>

Expand Down
Loading