-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Setup Java 21 container #28918
Setup Java 21 container #28918
Conversation
wordcount tested on Dataflow runner: https://console.cloud.google.com/dataflow/jobs/us-central1/2023-10-10_10_33_46-1503830796761633932?project=google.com%3Aclouddfe jamm warnings are fixed by add-open jvm flags |
5c01659
to
a67b78f
Compare
Codecov Report
@@ Coverage Diff @@
## master #28918 +/- ##
==========================================
- Coverage 38.38% 38.38% -0.01%
==========================================
Files 686 686
Lines 101640 101652 +12
==========================================
- Hits 39019 39018 -1
- Misses 61041 61054 +13
Partials 1580 1580
Flags with carried forward coverage won't be shown. Click here to find out more. see 2 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
a67b78f
to
6f616d7
Compare
Run Jpms Direct Java 11 PostCommit |
6f616d7
to
f86c519
Compare
* Add Java21 container * fix spotless * Update website * Fix jamm * align configs in recent change
f86c519
to
71fb124
Compare
Run Seed Job publish SDK container job succeeded: https://ci-beam.apache.org/job/beam_Publish_Beam_SDK_Snapshots/6308/ this included java21 container: gcr.io/apache-beam-testing/beam-sdk/beam_java21_sdk |
previously run jmps 11 test passed: https://ci-beam.apache.org/job/beam_PostCommit_Java_Jpms_Direct_Java11_PR/30/ |
R: @damccorm |
Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control |
R: @AnandInguva (since new Python support was done by you which was similar workflow) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly looks good, just had a couple minor questions
@@ -120,7 +121,7 @@ plugins.withType(JavaPlugin).configureEach{ | |||
// JPMS requires JDK > 8 | |||
project.tasks.each { | |||
it.onlyIf { | |||
project.hasProperty("compileAndRunTestsWithJava17") | |||
project.hasProperty('testJavaVersion') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this was just running on 17 previously - do we need tighter filtering here to avoid running on 11?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently Java11 JPMS test is done by setting
switches("-Dorg.gradle.java.home=${commonJobProperties.JAVA_11_HOME}") |
so everything runs on Java11;
while Java17 test is done by setting
switches("-PcompileAndRunTestsWithJava17") |
so all but compilation of jpms-test project are still run on Java8.
i.e. currently the combination of javahome=java 8+compileAndRunTestsWithJava11
option does not run test (where it supposed to). This change fixed the issue and make the behavior consistent for Java11/17/21
@@ -39,6 +40,7 @@ public class JvmVerification { | |||
versionMapping.put("0034", v1_8); | |||
versionMapping.put("0037", v11); | |||
versionMapping.put("003d", v17); | |||
versionMapping.put("0041", v21); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nonblocking since it seems to be consistently hex 002c + version
, but where are these coming from?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these are java bytecode versions. Yes from Java8 its been 44 (2c in hex) + version though no guarantee this trand continues. ref: https://javaalmanac.io/bytecode/versions/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Run Java PreCommit |
PreCommit Java paased on Jenkins, github action fn-execution test failure unrelated |
* Setup Java 21 container (apache#28833) * Add Java21 container * fix spotless * Update website * Fix jamm * align configs in recent change * incremental fixes * add more comments for when jpms test enabled
Part of #28120
roll forward of #28833 and fix issues revealed after it is merged; also fix relevant java21 logic that found in #28969 (needed for build java agent for container). By the time of #28833 there was not a chance to test java21 build logic because gradle 8.3 not yet support compile java21. Now they are tested on #28969
Please add a meaningful description for your change here
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
addresses #123
), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, commentfixes #<ISSUE NUMBER>
instead.CHANGES.md
with noteworthy changes.See the Contributor Guide for more tips on how to make review process smoother.
To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md
GitHub Actions Tests Status (on master branch)
See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.