Skip to content

docs: update demos with latest changes to EC2 plugin and globalLibraries #2724

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
timja merged 14 commits into from
Oct 17, 2025
Merged

docs: update demos with latest changes to EC2 plugin and globalLibraries #2724

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
abcde8c
docs: update demos with latest changes to EC2 plugin and globalLibraries
colshine1 Oct 11, 2025
cfefbeb
Update demos/ec2/README.md
timja Oct 11, 2025
fbc81fc
Update demos/ec2/README.md
colshine1 Oct 11, 2025
75f9f7a
Update test for EC2
colshine1 Oct 12, 2025
19006fe
Update test for EC2
colshine1 Oct 14, 2025
d7e541e
Update test for EC2
colshine1 Oct 14, 2025
04b5f30
Update pom.xml
timja Oct 14, 2025
7a38786
Update pom.xml
timja Oct 14, 2025
decfe2d
Update pom.xml
timja Oct 14, 2025
127e65e
Apply suggestions from code review
timja Oct 17, 2025
2f0951d
Update EC2CloudTest.java
timja Oct 17, 2025
8110fd9
Update integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTes…
timja Oct 17, 2025
b5edc40
Update integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTes…
timja Oct 17, 2025
da8849c
Update integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTes…
timja Oct 17, 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
2 changes: 1 addition & 1 deletion demos/ec2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Basic configuration of the [Amazon EC2 Plugin](https://plugins.jenkins.io/ec2)

```yaml
x-ec2_anchor: &ec2_anchor
associatePublicIp: false
associateIPStrategy: PRIVATE_IP
connectBySSHProcess: false
connectionStrategy: PRIVATE_IP
deleteRootOnTermination: false
Expand Down
2 changes: 1 addition & 1 deletion demos/jenkins/jenkins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ unclassified:
retriever:
modernSCM:
scm:
git:
gitSource:
remote: "https://github.com/jenkins-infra/pipeline-library.git"

location:
Expand Down
5 changes: 3 additions & 2 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 @@ -12,6 +12,7 @@

import hudson.model.labels.LabelAtom;
import hudson.plugins.ec2.AMITypeData;
import hudson.plugins.ec2.AssociateIPStrategy;
import hudson.plugins.ec2.EC2Cloud;
import hudson.plugins.ec2.SlaveTemplate;
import hudson.plugins.ec2.UnixData;
Expand Down Expand Up @@ -41,13 +42,13 @@ public void configure_ec2_cloud() {

SlaveTemplate slaveTemplate = templates.get(0);
assertThat(slaveTemplate.getDisplayName(), containsString("Auto configured EC2 Agent Small"));
assertFalse(slaveTemplate.getAssociatePublicIp());
assertFalse(slaveTemplate.isConnectBySSHProcess());
assertFalse(slaveTemplate.deleteRootOnTermination);
assertFalse(slaveTemplate.ebsOptimized);
assertFalse(slaveTemplate.monitoring);
assertFalse(slaveTemplate.stopOnTerminate);
assertFalse(slaveTemplate.useEphemeralDevices);
assertThat(slaveTemplate.getAssociateIPStrategy(), equalTo(AssociateIPStrategy.PRIVATE_IP));
assertThat(slaveTemplate.type, is(InstanceType.T2_SMALL.toString()));
assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
assertThat(slaveTemplate.getLabelString(), containsString("Small"));
Expand All @@ -71,7 +72,7 @@ public void configure_ec2_cloud() {

slaveTemplate = templates.get(1);
assertThat(slaveTemplate.getDisplayName(), containsString("Auto configured EC2 Agent Large"));
assertFalse(slaveTemplate.getAssociatePublicIp());
assertFalse(slaveTemplate.getAssociateIPStrategy());
Comment thread
timja marked this conversation as resolved.
Outdated
assertFalse(slaveTemplate.isConnectBySSHProcess());
assertFalse(slaveTemplate.deleteRootOnTermination);
assertFalse(slaveTemplate.ebsOptimized);
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
<plugin-bom.version>5294.va_d2e144c80e1</plugin-bom.version>
<plugin-bom.version>5577.vea_979d35b_b_ff</plugin-bom.version>
<spotless.check.skip>false</spotless.check.skip>
</properties>

Expand Down