jenkinsci
/
configuration-as-code-plugin
mirror of https://github.com/jenkinsci/configuration-as-code-plugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
renovate[bot] 2025-04-09 17:18:23 +00:00 committed by GitHub
parent 148f87d74b
commit e6cb90cb95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/ec2/README.md
View File

@ -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
integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java
View File

@ -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()));

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

@ -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
pom.xml
View File

@ -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>