Update plugin parent POM and forward compatibility for tests #200

basil · 2022-05-01T07:15:36Z

The underlying motivation for the parent POM update is that the new parent POM supports Java 17 and I want to do Java 17 testing of this plugin in jenkinsci/bom.

The underlying compatibility for the forward compatibility for tests is to support my ongoing efforts to switch plugin compatibility testing in jenkinsci/bom to use JENKINS-45047.

This change supersedes #184 (thank you @mikecirioli for the UI updates!). It contains the UI portions of that change without the controversial Jenkins baseline bump. The 4.40 parent POM update is unique to this PR.

…nto pom

basil

@jmMeessen This PR supersedes #199, #195, and #184. See the PR description for the motivation and my self-review for an explanation of each change. A timely merge and release of this PR would enable me to move forward with Java 17 compatibility testing in jenkinsci/bom#1097 and, ultimately, moving jenkinsci/bom to JENKINS-45047 in another future PR.

basil · 2022-05-01T17:35:02Z

pom.xml

        <groupId>org.jenkins-ci.plugins</groupId>
        <artifactId>plugin</artifactId>
-        <version>4.38</version>
+        <version>4.40</version>


This is needed to allow testing with Java 17 in jenkinsci/bom.

basil · 2022-05-01T17:35:27Z

pom.xml

+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
        <maven.javadoc.skip>true</maven.javadoc.skip>
        <jenkins.version>2.303.3</jenkins.version>
-        <java.level>8</java.level>


As of the update to parent POM 4.40, java.level is deprecated and inferred from the Jenkins core version. So this is no longer needed. I am deleting it to silence the deprecation warning.

basil · 2022-05-01T17:35:51Z

pom.xml

        <revision>3.10.0</revision>
        <changelist>-SNAPSHOT</changelist>
-        <gitHubRepo>jenkinsci/config-file-provider-plugin</gitHubRepo>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>


While I was here, improving this bit of logic to be consistent with the canonical format in jenkinsci/archetypes.

basil · 2022-05-01T17:36:42Z

pom.xml

-        <gitHubRepo>jenkinsci/config-file-provider-plugin</gitHubRepo>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
        <maven.javadoc.skip>true</maven.javadoc.skip>
        <jenkins.version>2.303.3</jenkins.version>


Note that we are not bumping the baseline here. This is to support my efforts to switch jenkinsci/bom to JENKINS-45047. This also is friendlier to users by allowing new releases to be adopted by older consumers.

basil · 2022-05-01T17:37:07Z

src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java


        HtmlPage configFiles = wc.goTo("configfiles");
-        HtmlAnchor removeAnchor = configFiles.getDocumentElement().getFirstByXPath("//a[contains(@onclick, 'removeConfig?id=" + CONFIG_ID + "')]");
+        String attribute = j.jenkins.getVersion().isOlderThan(new VersionNumber("2.324")) ? "onclick" : "data-url";


Here and elsewhere, we make the test compatible with both old and new versions of Jenkins by choosing the correct attribute based on the Jenkins version of the code under test.

basil · 2022-05-02T02:08:31Z

pom.xml

+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>email-ext</artifactId>
+            <scope>test</scope>
+        </dependency>


Needed for the email-ext PCT fix (see below).

basil · 2022-05-02T02:10:29Z

src/test/java/org/jenkinsci/lib/configprovider/SystemConfigFilesManagementTest.java

+        Assert.assertEquals(1, getProvider(JellyTemplateConfig.JellyTemplateConfigProvider.class).getAllConfigs().size());

-        Assert.assertEquals(5, GlobalConfigFiles.get().getConfigs().size());
+        Assert.assertEquals(6, GlobalConfigFiles.get().getConfigs().size());


When testing in PCT with email-ext on the classpath, this test fails with:

[ERROR] org.jenkinsci.lib.configprovider.SystemConfigFilesManagementTest.testLoadAndMergeOldData Time elapsed: 1.824 s <<< FAILURE! java.lang.AssertionError: expected:<5> but was:<6> at org.junit.Assert.fail(Assert.java:89) at org.junit.Assert.failNotEquals(Assert.java:835) at org.junit.Assert.assertEquals(Assert.java:647) at org.junit.Assert.assertEquals(Assert.java:633) at org.jenkinsci.lib.configprovider.SystemConfigFilesManagementTest.testLoadAndMergeOldData(SystemConfigFilesManagementTest.java:49) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.jvnet.hudson.test.JenkinsRule$1.evaluate(JenkinsRule.java:606) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:299) at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:293) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.base/java.lang.Thread.run(Thread.java:833)

Debugging this, I see that the presence of email-ext adds JellyTemplateConfig to the list of global configuration files. This test appears to have been designed for this scenario (see the commented line above) but it was never implemented, presumably due to the lack (at that time) of an easy way to add email-ext via jenkinsci/bom. Now that this is a solved problem, I can add email-ext to the classpath, with its version managed by jenkinsci/bom, and uncomment the above line to get this test to pass with email-ext. And this also enables PCT testing with the full managed set of the 100 plugins in the OSS BOM.

basil · 2022-05-02T19:57:26Z

Thanks @jmMeessen! I have tested this change on the bom-2.289.x and bom-weekly lines with both PCT (jenkinsci/bom#1097) and JENKINS-45047 (jenkinsci/bom#1059). In order for either of those two PRs to transition out of draft state, a new release of this plugin needs to be done. Would you be willing to perform such a release?

basil · 2022-05-04T22:22:03Z

@alecharp Are you interested in doing a release of this PR? As mentioned in the previous comment, this would help me move ahead with jenkinsci/bom#1097.

alecharp · 2022-05-05T07:33:54Z

@basil https://github.com/jenkinsci/config-file-provider-plugin/releases/tag/config-file-provider-3.10.0

mikecirioli and others added 5 commits February 22, 2022 15:44

Fix unit tests that fail due to jenkins CSS changes

8a4763f

update missing property

a3fd790

Update plugin parent POM

7e40b24

Merge remote-tracking branch 'mikecirioli/update-tests-for-new-css' i…

f862167

…nto pom

Avoid the need for a version bump

6082680

basil mentioned this pull request May 1, 2022

Add Config File Provider to the managed set jenkinsci/bom#1097

Merged

basil changed the title ~~Update plugin parent POM~~ Update plugin parent POM and forward compatibility for tests May 1, 2022

This was referenced May 1, 2022

Fix unit tests that fail due to jenkins CSS changes #184

Merged

Update dependencies #199

Closed

basil commented May 1, 2022

View reviewed changes

jetersen approved these changes May 1, 2022

View reviewed changes

Support PCT with email-ext

d773fd2

basil commented May 2, 2022

View reviewed changes

jmMeessen merged commit 4c961b9 into jenkinsci:master May 2, 2022

basil deleted the pom branch May 2, 2022 16:38

jmMeessen added the chore label Jul 20, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update plugin parent POM and forward compatibility for tests #200

Update plugin parent POM and forward compatibility for tests #200

Uh oh!

basil commented May 1, 2022 •

edited

Loading

Uh oh!

basil left a comment

Uh oh!

basil May 1, 2022

Uh oh!

basil May 1, 2022

Uh oh!

basil May 1, 2022

Uh oh!

basil May 1, 2022

Uh oh!

basil May 1, 2022

Uh oh!

basil May 2, 2022

Uh oh!

basil May 2, 2022

Uh oh!

basil commented May 2, 2022

Uh oh!

basil commented May 4, 2022

Uh oh!

alecharp commented May 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Update plugin parent POM and forward compatibility for tests #200

Update plugin parent POM and forward compatibility for tests #200

Uh oh!

Conversation

basil commented May 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

basil left a comment

Choose a reason for hiding this comment

Uh oh!

basil May 1, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 1, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 1, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 1, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 1, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 2, 2022

Choose a reason for hiding this comment

Uh oh!

basil May 2, 2022

Choose a reason for hiding this comment

Uh oh!

basil commented May 2, 2022

Uh oh!

basil commented May 4, 2022

Uh oh!

alecharp commented May 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

basil commented May 1, 2022 •

edited

Loading