Revive reduced servlet smoke test matrix on top of main#18953
Open
zeitlinger wants to merge 1 commit into
Open
Revive reduced servlet smoke test matrix on top of main#18953zeitlinger wants to merge 1 commit into
zeitlinger wants to merge 1 commit into
Conversation
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
4 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
This PR revives the earlier effort to reduce the servlet smoke-test matrix on pull requests (to improve CI time) while keeping the full matrix for merges to main, updating the wiring to match the current reusable workflow structure.
Changes:
- Adds a PR-only “reduced smoke tests” mode that skips non-representative app-server/JDK combinations in the servlet smoke tests.
- Propagates a new
reduced-smoke-testsworkflow input through the PR dispatcher → reusable workflows → Gradle invocation. - Adjusts servlet image build logic to pass the target matrix explicitly into task creation.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java | Implements reduced-mode skipping rules for servlet smoke test classes. |
| smoke-tests/images/servlet/build.gradle.kts | Updates docker task creation to accept the computed image targets map. |
| smoke-tests/build.gradle.kts | Maps -PreducedSmokeTests=true to a JVM system property consumed by tests. |
| .github/workflows/reusable-pr-build.yml | Adds reduced-smoke-tests input and forwards it into build-common.yml. |
| .github/workflows/build-pull-request.yml | Enables reduced smoke tests by default on PRs (unless test full smoke label is present). |
| .github/workflows/build-common.yml | Passes -PreducedSmokeTests=true into the smoke-test Gradle invocation when requested. |
Comment on lines
+76
to
+90
| if (this instanceof TomcatSmokeTest) { | ||
| assumeFalse(isOpenj9, "Reduced mode: Tomcat runs hotspot only"); | ||
| return; | ||
| } | ||
| if (this instanceof TomeeSmokeTest) { | ||
| assumeTrue(isOpenj9, "Reduced mode: TomEE runs openj9 only"); | ||
| return; | ||
| } | ||
| if (this instanceof WebsphereSmokeTest) { | ||
| return; | ||
| } | ||
| // All other servers: hotspot only, minimum JDK per server version | ||
| assumeFalse(isOpenj9, "Reduced mode: hotspot only"); | ||
| assumeTrue(isMinimumJdk(appServer), "Reduced mode: only minimum JDK per server version"); | ||
| } |
Comment on lines
462
to
467
| ./gradlew | ||
| :smoke-tests:test | ||
| -PsmokeTestSuite=${{ matrix.smoke-test-suite }} | ||
| ${{ inputs.reduced-smoke-tests && '-PreducedSmokeTests=true' || '' }} | ||
| ${{ inputs.skip-openj9-tests && matrix.smoke-test-suite != 'websphere' && '-PskipOpenJ9SmokeTests=true' || '' }} | ||
| ${{ inputs.no-build-cache && ' --no-build-cache' || '' }} |
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.
Revives #16810 on top of current
main.Summary
This refresh keeps the original intent of #16810:
mainmainThe reduced PR-mode matrix still aims to preserve coverage guarantees by:
What changed in this refresh
Compared to the original branch, this revival mainly rebases the change onto current workflow structure:
.github/workflows/build-pull-request.yml.github/workflows/reusable-pr-build.ymlreduced-smoke-teststhrough the current reusable workflow setupContext
The original PR was blocked by #17721, which has since merged on April 9, 2026.
Test plan