Support forthcoming PCT multimodule mode #2234

basil · 2023-03-23T03:45:15Z

jenkinsci/plugin-compat-tester#488 discusses the multimodule project branch of PCT and Maven HPI plugin, which runs PCT against entire repositories rather than individual plugin subdirectories. Trying this out in https://github.com/jenkinsci/bom/pull/1879/checks?check_run_id=12209541377 we started running the test-harness/ and integrations/ modules of Configuration as Code under PCT for the first time, turning up four new failures. This PR refreshes this repository; without introducing regression, it also ensures that those four new failures won't occur in the forthcoming multi-module aware PCT. See self-review for an explanation of the changes. To test this, I ran PLUGINS=configuration-as-code TEST=io.jenkins.plugins.casc.GlobalLibrariesTest,io.jenkins.plugins.casc.ConfigurationAsCodeTest,io.jenkins.plugins.casc.SchemaGenerationSanitisationTest,io.jenkins.plugins.casc.impl.configurators bash local-test.sh with the new multi-module aware PCT. Before this PR, I saw the four failures described above. After this PR, the test passes.

basil · 2023-03-23T05:50:09Z

integrations/pom.xml

@@ -16,27 +16,21 @@
    <jackson.version>2.14.2</jackson.version>
    <enforcer.skip>true</enforcer.skip> <!-- I give up, too much effort to maintain enforcer here, should probably try clear out all enforcer only deps and see if it works -->
    <netty.version>4.1.81.Final</netty.version>
-    <jenkins.version>2.387.1</jenkins.version>


Using jenkins.version from the multi-module project root. Too confusing to have multiple jenkins.version values in different modules: if a newer version is needed, just bump it in the multi-module project root and be done with it.

I guess with the tests now (or almost) being run in bom we can remove https://github.com/jenkins-infra/release/blob/c82d88610c99d0983a556c8b4d09063bb93d978a/.github/ISSUE_TEMPLATE/1-lts-release-checklist.md#L38

jenkins-infra/release#349

Ya that sounds like a good idea. Which means we can most likely also cleanup this:
https://github.com/jenkinsci/configuration-as-code-plugin/blob/master/.github/workflows/updatecli-action.yaml
https://github.com/jenkinsci/configuration-as-code-plugin/tree/master/updatecli

basil · 2023-03-23T05:50:23Z

integrations/pom.xml

    <junixsocket.version>2.5.1</junixsocket.version>
-    <kotlin-stdlib.version>1.7.20</kotlin-stdlib.version>


No longer needed to satisfy Enforcer.

basil · 2023-03-23T05:50:28Z

integrations/pom.xml

-      <exclusions>
-        <exclusion>
-          <groupId>org.json</groupId>
-          <artifactId>json</artifactId>
-        </exclusion>
-      </exclusions>


No longer needed to satisfy Enforcer.

basil · 2023-03-23T05:50:35Z

integrations/pom.xml

@@ -49,7 +43,6 @@
    <dependency>
      <groupId>com.coravy.hudson.plugins.github</groupId>
      <artifactId>github</artifactId>
-      <version>1.36.0</version>


Now in jenkinsci/bom.

basil · 2023-03-23T05:50:47Z

integrations/pom.xml

-    <dependency>
-      <groupId>org.apache.ivy</groupId>
-      <artifactId>ivy</artifactId>
-      <version>2.5.1</version>
-    </dependency>


No longer needed to satisfy Enforcer.

basil · 2023-03-23T05:57:24Z

integrations/src/test/resources/io/jenkins/plugins/casc/GlobalLibrariesGitHubTest.yml

@@ -17,4 +17,4 @@ unclassified:
                      strategyId: 2
                  - gitHubForkDiscovery:
                      strategyId: 3
-                      trust: "trustPermission"
+                      trust: "gitHubTrustPermissions"


Fixing this error when both GitHub Branch Source and GitLab Branch Source are on the classpath:

java.lang.AssertionError: Expected: an instance of org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission but: <io.jenkins.plugins.gitlabbranchsource.ForkMergeRequestDiscoveryTrait$TrustPermission@38d7261f> is a io.jenkins.plugins.gitlabbranchsource.ForkMergeRequestDiscoveryTrait$TrustPermission at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20) at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6) at io.jenkins.plugins.casc.GlobalLibrariesTest.configure_global_library_using_github(GlobalLibrariesTest.java:49) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) 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:613) 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:829)

basil · 2023-03-23T05:57:38Z

plugin/pom.xml

-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-    </dependency>


Not imported directly and therefore not necessary as a dependency.

basil · 2023-03-23T05:58:45Z

test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java

@@ -321,7 +321,7 @@ public void string_to_literal_in_export() throws Exception {
    @Test
    public void testHtmlDocStringRetrieval() throws Exception {
        String expectedDocString = "<div>\n"
-            + "  If checked, this will allow users who are not authenticated to access Jenkins in a read-only mode.\n"
+            + "  If checked, this will allow users who are not authenticated to access Jenkins\n  in a read-only mode.\n"


Adapting to jenkinsci/jenkins#6863.

basil · 2023-03-23T05:58:51Z

test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationSanitisationTest.java

@@ -15,7 +15,7 @@ public class SchemaGenerationSanitisationTest {

    @Test
    public void testRetrieveDocStringFromAttribute() {
-        String expectedDocString = "If checked, this will allow users who are not authenticated to access Jenkins in a read-only mode.";
+        String expectedDocString = "If checked, this will allow users who are not authenticated to access Jenkins\n  in a read-only mode.";


Adapting to jenkinsci/jenkins#6863.

basil · 2023-03-23T05:59:20Z

...arness/src/test/java/io/jenkins/plugins/casc/impl/configurators/MissingConfiguratorTest.java

+        // The conditions for this test can be false in PCT runs
+        assumeThat(j.jenkins.getPlugin("matrix-auth"), nullValue());


PCT runs with all plugins in the megawar, including matrix-auth, so skip this test in that context. It still runs in the context of this repository's CI build.

jetersen

LGTM @basil thanks for the PR.

This reverts commit 1d25476.

basil force-pushed the multimodule branch from ce19433 to 3c136a0 Compare March 23, 2023 05:42

Support forthcoming PCT multimodule mode

e87da68

basil force-pushed the multimodule branch from 3c136a0 to e87da68 Compare March 23, 2023 05:48

basil commented Mar 23, 2023

View reviewed changes

basil mentioned this pull request Mar 23, 2023

Enable prettier jenkinsci/jenkins#6863

Merged

Windows

11c4d67

basil marked this pull request as ready for review March 23, 2023 07:26

basil requested a review from a team as a code owner March 23, 2023 07:26

This was referenced Mar 23, 2023

Add GitHub Branch Source to the managed set jenkinsci/bom#1881

Closed

Native support for multi-module Maven projects jenkinsci/plugin-compat-tester#488

Closed

jetersen approved these changes Mar 23, 2023

View reviewed changes

timja added the developer label Mar 23, 2023

timja approved these changes Mar 23, 2023

View reviewed changes

timja mentioned this pull request Mar 23, 2023

Remove jcasc from LTS release template (as moving to bom) jenkins-infra/release#349

Merged

timja merged commit 1d25476 into jenkinsci:master Mar 23, 2023

basil deleted the multimodule branch March 23, 2023 15:18

timja added a commit that referenced this pull request Mar 23, 2023

Revert "Support forthcoming PCT multimodule mode (#2234)"

458d4f3

This reverts commit 1d25476.

timja mentioned this pull request Mar 23, 2023

Revert "Support forthcoming PCT multimodule mode" #2237

Closed

basil mentioned this pull request Mar 23, 2023

Restore JSR 305 annotations #2238

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support forthcoming PCT multimodule mode #2234

Support forthcoming PCT multimodule mode #2234

basil commented Mar 23, 2023 •

edited

basil Mar 23, 2023

timja Mar 23, 2023 •

edited

jetersen Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

basil Mar 23, 2023

jetersen left a comment

		<junixsocket.version>2.5.1</junixsocket.version>
		<kotlin-stdlib.version>1.7.20</kotlin-stdlib.version>

		// The conditions for this test can be false in PCT runs
		assumeThat(j.jenkins.getPlugin("matrix-auth"), nullValue());

Support forthcoming PCT multimodule mode #2234

Support forthcoming PCT multimodule mode #2234

Conversation

basil commented Mar 23, 2023 • edited

Choose a reason for hiding this comment

timja Mar 23, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jetersen left a comment

Choose a reason for hiding this comment

basil commented Mar 23, 2023 •

edited

timja Mar 23, 2023 •

edited