Run GlassFish integration tests against 7.x and 8.x#1143
Merged
Conversation
Split the single GlassFish container entry into per-major-version matrix entries, glassfish-v7 (7.1.0) and glassfish-v8 (8.0.2), so both supported major versions run in a single CI execution instead of one replacing the other. Each image line keeps its own '# renovate:' comment so Renovate tracks the two majors independently; the per-version enabled/timeout properties fall out of the existing '<name>.enabled' / '<name>.timeout' convention (glassfish-v7.enabled, glassfish-v8.enabled, both default true). Add a Renovate packageRule that constrains the 7.x line to the 7 series (allowedVersions < 8.0.0) while leaving the 8.x line open to major bumps, so a GlassFish 9 release still surfaces a PR and a glassfish-v9 entry can be added the same way v8 was added alongside v7. Fixes: apache#1059
This file contains hidden or 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
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.
What
Run the GlassFish integration tests against both supported major versions —
7.x and 8.x — in a single CI execution, instead of one image replacing the other.
container.properties: split the singleglassfish.imageentry intoglassfish-v7.image(7.1.0) andglassfish-v8.image(8.0.2), each kept onits own
# renovate:line so Renovate tracks the two majors independently.ContainerIT.java: replaced theglassfishmatrix entry withglassfish-v7and
glassfish-v8. The per-version*.enabled/*.timeoutproperties fallout of the existing
<name>.enabled/<name>.timeoutconvention, soglassfish-v7.enabledandglassfish-v8.enabledboth default totrueand adeveloper can disable either version locally.
Renovate
Both GlassFish lines share one
depName(eclipse-ee4j/embedded-glassfish), so apackageRulekeeps them from drifting into each other:allowedVersions: "< 8.0.0",selected via
matchCurrentVersion: "< 8.0.0"): it still receives minor/patchupdates, but never jumps to 8.x.
surfaces a PR and a
glassfish-v9entry can be added the same way v8 was addedalongside v7.
Verified locally with
renovate --platform=local --dry-run(Renovate 43) bytemporarily rolling the versions back:
glassfish-v7=7.0.07.0.0 → 7.1.0(minor); does not offer 8.xglassfish-v7=7.1.0(latest 7.x)glassfish-v8=8.0.08.0.0 → 8.0.2(patch)Renovate version-buckets the branches (
…-7.xvs…-8.x), so the two lines stayindependent despite the shared
depName.Supersedes the single-version Renovate bump in #1059.