Skip to content

Run GlassFish integration tests against 7.x and 8.x#1143

Merged
bdemers merged 1 commit into
apache:developfrom
bdemers:glassfish-multi-version-matrix
Jun 5, 2026
Merged

Run GlassFish integration tests against 7.x and 8.x#1143
bdemers merged 1 commit into
apache:developfrom
bdemers:glassfish-multi-version-matrix

Conversation

@bdemers

@bdemers bdemers commented Jun 5, 2026

Copy link
Copy Markdown
Member

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 single glassfish.image entry into
    glassfish-v7.image (7.1.0) and glassfish-v8.image (8.0.2), each kept on
    its own # renovate: line so Renovate tracks the two majors independently.
  • ContainerIT.java: replaced the glassfish matrix entry with glassfish-v7
    and glassfish-v8. The per-version *.enabled / *.timeout properties fall
    out of the existing <name>.enabled / <name>.timeout convention, so
    glassfish-v7.enabled and glassfish-v8.enabled both default to true and a
    developer can disable either version locally.
  • The other servers (Payara, WildFly, Open Liberty) are unchanged.

Renovate

Both GlassFish lines share one depName (eclipse-ee4j/embedded-glassfish), so a
packageRule keeps them from drifting into each other:

  • The 7.x line is constrained to the 7 series (allowedVersions: "< 8.0.0",
    selected via matchCurrentVersion: "< 8.0.0"): it still receives minor/patch
    updates, but never jumps to 8.x.
  • The 8.x line is left unconstrained, so a future GlassFish 9 release still
    surfaces a PR and a glassfish-v9 entry can be added the same way v8 was added
    alongside v7.

Verified locally with renovate --platform=local --dry-run (Renovate 43) by
temporarily rolling the versions back:

Scenario Result
glassfish-v7 = 7.0.0 proposes 7.0.0 → 7.1.0 (minor); does not offer 8.x
glassfish-v7 = 7.1.0 (latest 7.x) no update
glassfish-v8 = 8.0.0 proposes 8.0.0 → 8.0.2 (patch)

Renovate version-buckets the branches (…-7.x vs …-8.x), so the two lines stay
independent despite the shared depName.

Supersedes the single-version Renovate bump in #1059.

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
@bdemers bdemers merged commit fde3e51 into apache:develop Jun 5, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant