Fix opt-in for Maven Failsafe plugin #462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basil
added a commit
to basil/bom
that referenced
this pull request
Feb 16, 2023
basil
added a commit
to basil/bom
that referenced
this pull request
Feb 16, 2023
timja
approved these changes
Feb 17, 2023
jtnord
approved these changes
Feb 17, 2023
| * Custom execution hook for plugins whose parent is {@code org.jvnet.hudson.plugins:analysis-pom}. | ||
| * These plugins use Maven Failsafe Plugin in their test suites. | ||
| */ | ||
| public class AnalysisPomExecutionHook extends PluginWithFailsafeIntegrationTestsHook { |
There was a problem hiding this comment.
CloudBees' has no internal users of PluginWithFailsafeIntegrationTestsHook (nee PluginWithFailsafeIntegrationTestsHook)
And as implemented PluginWithFailsafeIntegrationTestsHook is incorrect as to be generic it should be executing pre-integration-test then integration-test and finally post-integration-test.
the analysis-pom's configuration of failsafe does not follow this generic nature as it is not spinning anything up.
Perhaps it is worth just removing PluginWithFailsafeIntegrationTestsHook and then inlining getGoals here in a way that is specific to Ulli's usage.
Suggested change
| public class AnalysisPomExecutionHook extends PluginWithFailsafeIntegrationTestsHook { | |
| public class AnalysisPomExecutionHook extends PluginWithIntegrationTestsHook { |
| return "io.jenkins.plugins".equals(data.groupId) | ||
| && ARTIFACT_IDS.contains(data.artifactId) | ||
| && "hpi".equals(data.getPackaging()); | ||
| } |
There was a problem hiding this comment.
Suggested change
| } | |
| } | |
| @Override | |
| public Collection<String> getGoals() { | |
| return List.of("failsafe:integration-test"); | |
| } |
|
I am here to make it better, not to make it perfect. I am not going to do what was suggested. |
basil
added a commit
to basil/bom
that referenced
this pull request
Feb 27, 2023
timja
pushed a commit
to jenkinsci/bom
that referenced
this pull request
Feb 27, 2023
lemeurherve
pushed a commit
to lemeurherve/bom
that referenced
this pull request
Mar 31, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #461.
PluginWithFailsafeIntegrationTestsHookwas meant to be a way for plugins to opt-in to having their Maven Failsafe plugin tests executed, but the class is not marked asabstract. Sinceplugin-compat-tester/src/main/java/org/jenkins/tools/test/model/hook/PluginCompatTesterHooks.java
Line 186 in 0838e05
PluginWithFailsafeIntegrationTestsHookgets executed unconditionally, resulting in workarounds like https://github.com/jenkinsci/bom/blob/c72362731c98313189c04025c3b7bc181da4c121/pct.sh#L22-L25. This PR solves the problem by markingPluginWithFailsafeIntegrationTestsHookas abstract, which allows the abovementioned workaround to be removed. That, in turn, exposed the fact that Dr Ullrich Hafner's plugins run their tests using a combination of Surefire and Failsafe, so to ensure the status quo is preserved I added a new hook to explicitly opt in to Failsafe for those plugins. And with that, jenkinsci/bom#1764 now passes.