[JENKINS-73282] Run PCT with a Jetty 12 EE 8 test harness when core is Jetty 12 EE 8 #675
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
commented
Jun 21, 2024
| public boolean check(@NonNull BeforeExecutionContext context) { | ||
| VersionNumber winstoneVersion = getWinstoneVersion(context.getConfig().getWar()); | ||
| if (winstoneVersion.getDigitAt(0) < 7) { | ||
| return false; |
There was a problem hiding this comment.
Do nothing if Winstone is Jetty 10 …
| if (winstoneVersion.getDigitAt(0) < 7) { | ||
| return false; | ||
| } | ||
| return super.check(context); |
There was a problem hiding this comment.
… but otherwise invoke the logic in the superclass, which dynamically updates jenkins-test-harness.version to 2230.v4fa_477b_634f4, but only if the current value of the version is older (newer values don't need to be overridden).
imonteroperez
approved these changes
Jun 21, 2024
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.
See JENKINS-73282. This PR has no effect for trunk, but once core adopts Jetty 12, this will dynamically upgrade the test harness to a Jetty 12 test harness (but only if necessary). The minimum test harness release is https://github.com/jenkinsci/jenkins-test-harness/releases/tag/2230.v4fa_477b_634f4 which supports Jetty 12 EE 8 and EE 9. This will allow plugins to be tested on Jetty 12 in PCT without having to upgrade each plugin's parent POM individually. Of course, once the plugin parent POMs are updated, this will have no effect. Eventually this code can be deleted once all plugins are on a plugin parent POM that includes Jetty 12 in its test harness.
Testing done
Tested with the latest weekly core as well as a Jetty 12 EE 8 core. In the latter case, the test harness was automatically upgraded as expected. Tested interactively in BOM in jenkinsci/bom#3314.