Skip to content
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.

Sign up for GitHub

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 #28833

Merged
merged 6 commits into from
Oct 12, 2023
Merged

Setup Java 21 container #28833

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06de3c9
Add Java21 container
Abacn Oct 4, 2023
fe8543f
fix spotless
Abacn Oct 6, 2023
95b0d3b
Update website
Abacn Oct 6, 2023
f9732e8
Fix jamm
Abacn Oct 10, 2023
6817ce0
Merge branch 'master' into java21container
Abacn Oct 11, 2023
95a06c6
align configs in recent change
Abacn Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this flag change is to address #28726 (comment) (later planned as part of Java21 support: #28120 (comment))

-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
Expand All @@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
Expand All @@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
Expand All @@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
Expand All @@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
Expand All @@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
Expand All @@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_7 }}'
14 changes: 7 additions & 7 deletions .github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
Expand All @@ -108,7 +108,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
Expand All @@ -119,7 +119,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
Expand All @@ -130,7 +130,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
Expand All @@ -141,7 +141,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
Expand All @@ -152,7 +152,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
Expand All @@ -163,6 +163,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_7 }}'
14 changes: 7 additions & 7 deletions .github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
Expand All @@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
Expand All @@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
Expand All @@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
Expand All @@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
Expand All @@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
Expand All @@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_7 }}'
14 changes: 7 additions & 7 deletions .github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
Expand All @@ -108,7 +108,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
Expand All @@ -119,7 +119,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
Expand All @@ -130,7 +130,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
Expand All @@ -141,7 +141,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
Expand All @@ -152,7 +152,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
Expand All @@ -163,6 +163,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_7 }}'
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
gradle-command: :runners:google-cloud-dataflow-java:arm:examplesJavaRunnerV2IntegrationTestARM
max-workers: 12
arguments: |
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-PtestJavaVersion${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-Pcontainer-architecture-list=arm64,amd64 \
-Ppush-containers \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-PtestJavaVersion${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest
arguments:
-PskipCheckerFramework
-PcompileAndRunTestsWithJava17
-PtestJavaVersion=17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:directRunnerIntegrationTest
arguments:
-PskipCheckerFramework
-PcompileAndRunTestsWithJava17
-PtestJavaVersion=17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:nexmark:run
arguments: |
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-PtestJavaVersion${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-Pnexmark.runner.version=V2 \
-Pnexmark.runner=:runners:google-cloud-dataflow-java \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_TransformService_Direct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
with:
gradle-command: :sdks:python:test-suites:direct:xlang:transformServicePythonUsingJava
arguments: |
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
-PuseWheelDistribution \
-PpythonVersion=${{ matrix.python_version }} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-PskipCheckerFramework \
-Pjava17Home=$JAVA_HOME_17_X64 \
max-workers: 12
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_SQL_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PcompileAndRunTestsWithJava11 \
-PtestJavaVersion=11 \
-PskipCheckerFramework \
-Pjava11Home=$JAVA_HOME_11_X64 \
- name: Archive JUnit Test Results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PreCommit_SQL_Java17.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PcompileAndRunTestsWithJava17 \
-PtestJavaVersion=17 \
-PskipCheckerFramework \
-Pjava17Home=$JAVA_HOME_17_X64 \
- name: Archive JUnit Test Results
Expand Down
7 changes: 6 additions & 1 deletion .test-infra/jenkins/JavaTestProperties.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@
*/

class JavaTestProperties {
final static List<String> SUPPORTED_CONTAINER_TASKS = ['java8', 'java11', 'java17']
final static List<String> SUPPORTED_CONTAINER_TASKS = [
'java8',
'java11',
'java17',
'java21'
]
}
4 changes: 2 additions & 2 deletions .test-infra/jenkins/NexmarkBuilder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class NexmarkBuilder {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
commonJobProperties.setGradleSwitches(delegate)
switches("-PcompileAndRunTestsWithJava11")
switches("-PtestJavaVersion=11")
switches("-Pjava11Home=${commonJobProperties.JAVA_11_HOME}")
switches("-Pnexmark.runner=${runner.getDependencyBySDK(sdk)}")
switches("-Pnexmark.args=\"${parseOptions(options)}\"")
Expand All @@ -168,7 +168,7 @@ class NexmarkBuilder {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
commonJobProperties.setGradleSwitches(delegate)
switches("-PcompileAndRunTestsWithJava17")
switches("-PtestJavaVersion=17")
switches("-Pjava17Home=${commonJobProperties.JAVA_17_HOME}")
switches("-Pnexmark.runner=${runner.getDependencyBySDK(sdk)}")
switches("-Pnexmark.args=\"${parseOptions(options)}\"")
Expand Down
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def loadTestConfigurations = { mode, isStreaming ->

def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
'-PcompileAndRunTestsWithJava11',
'-PtestJavaVersion=11',
"-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
]

Expand Down
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def loadTestConfigurations = { mode, isStreaming ->

def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
'-PcompileAndRunTestsWithJava17',
'-PtestJavaVersion=17',
"-Pjava17Home=${commonJobProperties.JAVA_17_HOME}"
]

Expand Down
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def loadTestConfigurations = { mode, isStreaming ->

def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
'-PcompileAndRunTestsWithJava11',
'-PtestJavaVersion=11',
"-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
]

Expand Down
Loading
Loading