From a8be8b17a25336383346f4975c37b375166c93dd Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Mon, 11 Sep 2023 10:37:33 -0600 Subject: [PATCH 1/4] update for dedicated cloud rename page --- pom.xml | 2 +- .../hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly | 3 --- .../hudson/plugins/ec2/Eucalyptus/config-entries.jelly | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b006224d1..fd999271a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ THE SOFTWARE. 999999-SNAPSHOT - 2.414 + 2.423-rc34197.1024b_9eb_344b_ jenkinsci/${project.artifactId}-plugin diff --git a/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly b/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly index 6e8c276b9..91ac7d222 100644 --- a/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly +++ b/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly @@ -19,9 +19,6 @@ THE SOFTWARE. --> - - - diff --git a/src/main/resources/hudson/plugins/ec2/Eucalyptus/config-entries.jelly b/src/main/resources/hudson/plugins/ec2/Eucalyptus/config-entries.jelly index 7036fd28b..e0b89c188 100644 --- a/src/main/resources/hudson/plugins/ec2/Eucalyptus/config-entries.jelly +++ b/src/main/resources/hudson/plugins/ec2/Eucalyptus/config-entries.jelly @@ -19,9 +19,6 @@ THE SOFTWARE. --> - - - From 6c38bdcc81c869ac37d9f73ee0f59db282641fdb Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Tue, 12 Sep 2023 11:43:50 -0600 Subject: [PATCH 2/4] clean up tests --- .../java/hudson/plugins/ec2/AmazonEC2CloudTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java b/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java index 09a991a15..17c3b260f 100644 --- a/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java +++ b/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java @@ -73,8 +73,8 @@ public void setUp() throws Exception { @Test public void testConfigRoundtrip() throws Exception { - r.submit(getConfigForm()); - r.assertEqualBeans(cloud, r.jenkins.clouds.get(AmazonEC2Cloud.class), "cloudName,region,useInstanceProfileForCredentials,privateKey,instanceCap,roleArn,roleSessionName"); + r.submit(getConfigForm(cloud)); + r.assertEqualBeans(cloud, r.jenkins.clouds.get(AmazonEC2Cloud.class), "region,useInstanceProfileForCredentials,privateKey,instanceCap,roleArn,roleSessionName"); } @Test @@ -87,14 +87,14 @@ public void testAmazonEC2FactoryGetInstance() throws Exception { @Test public void testSshKeysCredentialsIdRemainsUnchangedAfterUpdatingOtherFields() throws Exception { - HtmlForm form = getConfigForm(); + HtmlForm form = getConfigForm(cloud); HtmlTextInput input = form.getInputByName("_.roleSessionName"); input.setText("updatedSessionName"); r.submit(form); AmazonEC2Cloud actual = r.jenkins.clouds.get(AmazonEC2Cloud.class); assertEquals("updatedSessionName", actual.getRoleSessionName()); - r.assertEqualBeans(cloud, actual, "cloudName,region,useInstanceProfileForCredentials,sshKeysCredentialsId,instanceCap,roleArn"); + r.assertEqualBeans(cloud, actual, "region,useInstanceProfileForCredentials,sshKeysCredentialsId,instanceCap,roleArn"); } @Test @@ -161,7 +161,7 @@ public void testCustomSshCredentialTypes() throws IOException { assertThat(actual.resolvePrivateKey(), notNullValue()); } - private HtmlForm getConfigForm() throws IOException, SAXException { + private HtmlForm getConfigForm(AmazonEC2Cloud cloud) throws IOException, SAXException { return r.createWebClient().goTo(cloud.getUrl() + "configure").getFormByName("config"); } From 3980b8d8fdc63b7c872cfd9f40ab5a4c7a0dee6e Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Tue, 12 Sep 2023 18:08:07 -0600 Subject: [PATCH 3/4] update incremental --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd999271a..df4b1e281 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ THE SOFTWARE. 999999-SNAPSHOT - 2.423-rc34197.1024b_9eb_344b_ + 2.423-rc34199.8c3d6c65b_758 jenkinsci/${project.artifactId}-plugin From e895d3ae2e0e611fe1aa74b1c1472909bd8f5535 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Tue, 12 Sep 2023 19:39:53 -0600 Subject: [PATCH 4/4] update additional failing tests --- .../java/hudson/plugins/ec2/EucalyptusTest.java | 2 +- .../hudson/plugins/ec2/SlaveTemplateTest.java | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/test/java/hudson/plugins/ec2/EucalyptusTest.java b/src/test/java/hudson/plugins/ec2/EucalyptusTest.java index 970eff372..62424eade 100644 --- a/src/test/java/hudson/plugins/ec2/EucalyptusTest.java +++ b/src/test/java/hudson/plugins/ec2/EucalyptusTest.java @@ -20,6 +20,6 @@ public void configRoundTrip() throws Exception { HtmlPage p = wc.goTo(cloud.getUrl() + "configure"); HtmlForm f = p.getFormByName("config"); r.submit(f); - r.assertEqualBeans(cloud, r.jenkins.getCloud("test"), "name,ec2EndpointUrl,s3EndpointUrl,useInstanceProfileForCredentials,roleArn,roleSessionName,credentialsId,sshKeysCredentialsId,instanceCap,templates"); + r.assertEqualBeans(cloud, r.jenkins.getCloud("test"), "ec2EndpointUrl,s3EndpointUrl,useInstanceProfileForCredentials,roleArn,roleSessionName,credentialsId,sshKeysCredentialsId,instanceCap,templates"); } } diff --git a/src/test/java/hudson/plugins/ec2/SlaveTemplateTest.java b/src/test/java/hudson/plugins/ec2/SlaveTemplateTest.java index deb7d4043..8ec66afec 100644 --- a/src/test/java/hudson/plugins/ec2/SlaveTemplateTest.java +++ b/src/test/java/hudson/plugins/ec2/SlaveTemplateTest.java @@ -53,16 +53,13 @@ import hudson.model.Node; import hudson.plugins.ec2.SlaveTemplate.ProvisionOptions; import hudson.plugins.ec2.util.MinimumNumberOfInstancesTimeRangeConfig; -import org.htmlunit.html.HtmlForm; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.mockito.ArgumentCaptor; -import org.xml.sax.SAXException; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; @@ -110,7 +107,7 @@ public void testConfigRoundtrip() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "ami,zone,description,remoteFS,type,javaPath,jvmopts,stopOnTerminate,securityGroups,subnetId,tags,iamInstanceProfile,useEphemeralDevices,useDedicatedTenancy,connectionStrategy,hostKeyVerificationStrategy,tenancy,ebsEncryptRootVolume"); // For already existing strategies, the default is this one @@ -132,7 +129,7 @@ public void testConfigRoundtripWithCustomSSHHostKeyVerificationStrategy() throws AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "ami,zone,description,remoteFS,type,javaPath,jvmopts,stopOnTerminate,securityGroups,subnetId,useEphemeralDevices,useDedicatedTenancy,connectionStrategy,hostKeyVerificationStrategy"); assertEquals(STRATEGY_TO_CHECK, received.getHostKeyVerificationStrategy()); @@ -161,7 +158,7 @@ public void testConfigWithSpotBidPrice() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "ami,zone,spotConfig,description,remoteFS,type,javaPath,jvmopts,stopOnTerminate,securityGroups,subnetId,tags,usePrivateDnsName"); } @@ -185,7 +182,7 @@ public void testSpotConfigWithoutBidPrice() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "ami,zone,spotConfig,description,remoteFS,type,javaPath,jvmopts,stopOnTerminate,securityGroups,subnetId,tags,usePrivateDnsName"); } @@ -202,7 +199,7 @@ public void testWindowsConfigRoundTrip() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); assertEquals(orig.getAdminPassword(), received.getAdminPassword()); assertEquals(orig.amiType, received.amiType); @@ -220,7 +217,7 @@ public void testUnixConfigRoundTrip() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "amiType"); } @@ -425,7 +422,7 @@ public void testMacConfig() throws Exception { AmazonEC2Cloud ac = new AmazonEC2Cloud("us-east-1", false, "abc", "us-east-1", "ghi", "3", templates, null, null); r.jenkins.clouds.add(ac); - r.submit(getConfigForm(ac)); + r.submit(r.createWebClient().goTo(ac.getUrl() + "configure").getFormByName("config")); SlaveTemplate received = ((EC2Cloud) r.jenkins.clouds.iterator().next()).getTemplate(description); r.assertEqualBeans(orig, received, "type,amiType"); }