Skip to content

Commit 421dd8d

Browse files
sjvanrossumsjvanrossum
committed
Refactor Java toolchain selection using Gradle toolchain management
1 parent 91b09c8 commit 421dd8d

File tree

45 files changed

+403
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+403
-587
lines changed

‎.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ jobs:
9595
with:
9696
gradle-command: :sdks:java:testing:load-tests:run
9797
arguments: |
98-
-PtestJavaVersion=${{ matrix.java_version }} \
99-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
98+
-PjavaVersion=${{ matrix.java_version }} \
99+
-Porg.gradle.java.installations.auto-detect=false \
100+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
100101
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
101102
-Prunner=:runners:google-cloud-dataflow-java \
102103
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions_test_arguments_1 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_CoGBK_1' \
@@ -105,8 +106,9 @@ jobs:
105106
with:
106107
gradle-command: :sdks:java:testing:load-tests:run
107108
arguments: |
108-
-PtestJavaVersion=${{ matrix.java_version }} \
109-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
109+
-PjavaVersion=${{ matrix.java_version }} \
110+
-Porg.gradle.java.installations.auto-detect=false \
111+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
110112
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
111113
-Prunner=:runners:google-cloud-dataflow-java \
112114
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions_test_arguments_2 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_CoGBK_2' \
@@ -115,8 +117,9 @@ jobs:
115117
with:
116118
gradle-command: :sdks:java:testing:load-tests:run
117119
arguments: |
118-
-PtestJavaVersion=${{ matrix.java_version }} \
119-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
120+
-PjavaVersion=${{ matrix.java_version }} \
121+
-Porg.gradle.java.installations.auto-detect=false \
122+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
120123
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
121124
-Prunner=:runners:google-cloud-dataflow-java \
122125
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions_test_arguments_3 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_CoGBK_3' \
@@ -125,8 +128,9 @@ jobs:
125128
with:
126129
gradle-command: :sdks:java:testing:load-tests:run
127130
arguments: |
128-
-PtestJavaVersion=${{ matrix.java_version }} \
129-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
131+
-PjavaVersion=${{ matrix.java_version }} \
132+
-Porg.gradle.java.installations.auto-detect=false \
133+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
130134
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
131135
-Prunner=:runners:google-cloud-dataflow-java \
132136
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions_test_arguments_4 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_CoGBK_4'

‎.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ jobs:
9595
with:
9696
gradle-command: :sdks:java:testing:load-tests:run
9797
arguments: |
98-
-PtestJavaVersion=${{ matrix.java_version }} \
99-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
98+
-PjavaVersion=${{ matrix.java_version }} \
99+
-Porg.gradle.java.installations.auto-detect=false \
100+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
100101
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
101102
-Prunner=:runners:google-cloud-dataflow-java \
102103
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions_test_arguments_1 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_streaming_CoGBK_1' \
@@ -105,8 +106,9 @@ jobs:
105106
with:
106107
gradle-command: :sdks:java:testing:load-tests:run
107108
arguments: |
108-
-PtestJavaVersion=${{ matrix.java_version }} \
109-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
109+
-PjavaVersion=${{ matrix.java_version }} \
110+
-Porg.gradle.java.installations.auto-detect=false \
111+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
110112
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
111113
-Prunner=:runners:google-cloud-dataflow-java \
112114
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions_test_arguments_2 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_streaming_CoGBK_2' \
@@ -115,8 +117,9 @@ jobs:
115117
with:
116118
gradle-command: :sdks:java:testing:load-tests:run
117119
arguments: |
118-
-PtestJavaVersion=${{ matrix.java_version }} \
119-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
120+
-PjavaVersion=${{ matrix.java_version }} \
121+
-Porg.gradle.java.installations.auto-detect=false \
122+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
120123
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
121124
-Prunner=:runners:google-cloud-dataflow-java \
122125
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions_test_arguments_3 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_streaming_CoGBK_3' \
@@ -125,8 +128,9 @@ jobs:
125128
with:
126129
gradle-command: :sdks:java:testing:load-tests:run
127130
arguments: |
128-
-PtestJavaVersion=${{ matrix.java_version }} \
129-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
131+
-PjavaVersion=${{ matrix.java_version }} \
132+
-Porg.gradle.java.installations.auto-detect=false \
133+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
130134
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
131135
-Prunner=:runners:google-cloud-dataflow-java \
132136
'-PloadTest.args=${{ env.beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions_test_arguments_4 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_streaming_CoGBK_4'

‎.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ jobs:
9797
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
9898
-Prunner=:runners:google-cloud-dataflow-java \
9999
-Prunner.version=V2 \
100-
-PtestJavaVersion=17 \
101-
-Pjava17Home=$JAVA_HOME_17_X64 \
100+
-PjavaVersion=17 \
101+
-Porg.gradle.java.installations.auto-detect=false \
102+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
102103
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_1 }}' \
103104
- name: run Load test 2GB of 100B records
104105
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -108,8 +109,9 @@ jobs:
108109
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
109110
-Prunner=:runners:google-cloud-dataflow-java \
110111
-Prunner.version=V2 \
111-
-PtestJavaVersion=17 \
112-
-Pjava17Home=$JAVA_HOME_17_X64 \
112+
-PjavaVersion=17 \
113+
-Porg.gradle.java.installations.auto-detect=false \
114+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
113115
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_2 }}' \
114116
- name: run Load test 2GB of 100kB records
115117
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -119,8 +121,9 @@ jobs:
119121
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
120122
-Prunner=:runners:google-cloud-dataflow-java \
121123
-Prunner.version=V2 \
122-
-PtestJavaVersion=17 \
123-
-Pjava17Home=$JAVA_HOME_17_X64 \
124+
-PjavaVersion=17 \
125+
-Porg.gradle.java.installations.auto-detect=false \
126+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
124127
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_3 }}' \
125128
- name: run Load test fanout 4 times with 2GB 10-byte records total
126129
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -130,8 +133,9 @@ jobs:
130133
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
131134
-Prunner=:runners:google-cloud-dataflow-java \
132135
-Prunner.version=V2 \
133-
-PtestJavaVersion=17 \
134-
-Pjava17Home=$JAVA_HOME_17_X64 \
136+
-PjavaVersion=17 \
137+
-Porg.gradle.java.installations.auto-detect=false \
138+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
135139
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_4 }}' \
136140
- name: run Load test fanout 8 times with 2GB 10-byte records total
137141
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -141,8 +145,9 @@ jobs:
141145
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
142146
-Prunner=:runners:google-cloud-dataflow-java \
143147
-Prunner.version=V2 \
144-
-PtestJavaVersion=17 \
145-
-Pjava17Home=$JAVA_HOME_17_X64 \
148+
-PjavaVersion=17 \
149+
-Porg.gradle.java.installations.auto-detect=false \
150+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
146151
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_5 }}' \
147152
- name: run Load test reiterate 4 times 10kB values
148153
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -152,8 +157,9 @@ jobs:
152157
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
153158
-Prunner=:runners:google-cloud-dataflow-java \
154159
-Prunner.version=V2 \
155-
-PtestJavaVersion=17 \
156-
-Pjava17Home=$JAVA_HOME_17_X64 \
160+
-PjavaVersion=17 \
161+
-Porg.gradle.java.installations.auto-detect=false \
162+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
157163
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_6 }}' \
158164
- name: run Load test reiterate 4 times 2MB values
159165
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -163,6 +169,7 @@ jobs:
163169
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
164170
-Prunner=:runners:google-cloud-dataflow-java \
165171
-Prunner.version=V2 \
166-
-PtestJavaVersion=17 \
167-
-Pjava17Home=$JAVA_HOME_17_X64 \
172+
-PjavaVersion=17 \
173+
-Porg.gradle.java.installations.auto-detect=false \
174+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
168175
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_7 }}'

‎.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ jobs:
9797
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
9898
-Prunner=:runners:google-cloud-dataflow-java \
9999
-Prunner.version=V2 \
100-
-PtestJavaVersion=17 \
101-
-Pjava17Home=$JAVA_HOME_17_X64 \
100+
-PjavaVersion=17 \
101+
-Porg.gradle.java.installations.auto-detect=false \
102+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
102103
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_1 }}' \
103104
- name: run Load test 2GB of 100B records
104105
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -108,8 +109,9 @@ jobs:
108109
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
109110
-Prunner=:runners:google-cloud-dataflow-java \
110111
-Prunner.version=V2 \
111-
-PtestJavaVersion=17 \
112-
-Pjava17Home=$JAVA_HOME_17_X64 \
112+
-PjavaVersion=17 \
113+
-Porg.gradle.java.installations.auto-detect=false \
114+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
113115
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_2 }}' \
114116
- name: run Load test 2GB of 100kB records
115117
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -119,8 +121,9 @@ jobs:
119121
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
120122
-Prunner=:runners:google-cloud-dataflow-java \
121123
-Prunner.version=V2 \
122-
-PtestJavaVersion=17 \
123-
-Pjava17Home=$JAVA_HOME_17_X64 \
124+
-PjavaVersion=17 \
125+
-Porg.gradle.java.installations.auto-detect=false \
126+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
124127
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_3 }}' \
125128
- name: run Load test fanout 4 times with 2GB 10-byte records total
126129
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -130,8 +133,9 @@ jobs:
130133
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
131134
-Prunner=:runners:google-cloud-dataflow-java \
132135
-Prunner.version=V2 \
133-
-PtestJavaVersion=17 \
134-
-Pjava17Home=$JAVA_HOME_17_X64 \
136+
-PjavaVersion=17 \
137+
-Porg.gradle.java.installations.auto-detect=false \
138+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
135139
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_4 }}' \
136140
- name: run Load test fanout 8 times with 2GB 10-byte records total
137141
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -141,8 +145,9 @@ jobs:
141145
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
142146
-Prunner=:runners:google-cloud-dataflow-java \
143147
-Prunner.version=V2 \
144-
-PtestJavaVersion=17 \
145-
-Pjava17Home=$JAVA_HOME_17_X64 \
148+
-PjavaVersion=17 \
149+
-Porg.gradle.java.installations.auto-detect=false \
150+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
146151
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_5 }}' \
147152
- name: run Load test reiterate 4 times 10kB values
148153
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -152,8 +157,9 @@ jobs:
152157
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
153158
-Prunner=:runners:google-cloud-dataflow-java \
154159
-Prunner.version=V2 \
155-
-PtestJavaVersion=17 \
156-
-Pjava17Home=$JAVA_HOME_17_X64 \
160+
-PjavaVersion=17 \
161+
-Porg.gradle.java.installations.auto-detect=false \
162+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
157163
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_6 }}' \
158164
- name: run Load test reiterate 4 times 2MB values
159165
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -163,6 +169,7 @@ jobs:
163169
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
164170
-Prunner=:runners:google-cloud-dataflow-java \
165171
-Prunner.version=V2 \
166-
-PtestJavaVersion=17 \
167-
-Pjava17Home=$JAVA_HOME_17_X64 \
172+
-PjavaVersion=17 \
173+
-Porg.gradle.java.installations.auto-detect=false \
174+
-Porg.gradle.java.installations.paths=$JAVA_HOME_17_X64 \
168175
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_7 }}'

‎.github/workflows/beam_LoadTests_Java_ParDo_Dataflow_V2_Batch_JavaVersions.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ jobs:
9898
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.ParDoLoadTest \
9999
-Prunner=:runners:google-cloud-dataflow-java \
100100
-Prunner.version=V2 \
101-
-PtestJavaVersion=${{ matrix.java_version }} \
102-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
101+
-PjavaVersion=${{ matrix.java_version }} \
102+
-Porg.gradle.java.installations.auto-detect=false \
103+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
103104
'-PloadTest.args=${{ env.beam_LoadTests_Java_ParDo_Dataflow_V2_Batch_JavaVersions_test_arguments_1 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_ParDo_1' \
104105
- name: run ParDo Dataflow V2 Batch Java Load Test 2 (200 times)
105106
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -109,8 +110,9 @@ jobs:
109110
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.ParDoLoadTest \
110111
-Prunner=:runners:google-cloud-dataflow-java \
111112
-Prunner.version=V2 \
112-
-PtestJavaVersion=${{ matrix.java_version }} \
113-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
113+
-PjavaVersion=${{ matrix.java_version }} \
114+
-Porg.gradle.java.installations.auto-detect=false \
115+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
114116
'-PloadTest.args=${{ env.beam_LoadTests_Java_ParDo_Dataflow_V2_Batch_JavaVersions_test_arguments_2 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_ParDo_2' \
115117
- name: run ParDo Dataflow V2 Batch Java Load Test 3 (10 counters)
116118
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -120,8 +122,9 @@ jobs:
120122
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.ParDoLoadTest \
121123
-Prunner=:runners:google-cloud-dataflow-java \
122124
-Prunner.version=V2 \
123-
-PtestJavaVersion=${{ matrix.java_version }} \
124-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
125+
-PjavaVersion=${{ matrix.java_version }} \
126+
-Porg.gradle.java.installations.auto-detect=false \
127+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
125128
'-PloadTest.args=${{ env.beam_LoadTests_Java_ParDo_Dataflow_V2_Batch_JavaVersions_test_arguments_3 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_ParDo_3' \
126129
- name: run ParDo Dataflow V2 Batch Java Load Test 4 (100 counters)
127130
uses: ./.github/actions/gradle-command-self-hosted-action
@@ -131,6 +134,7 @@ jobs:
131134
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.ParDoLoadTest \
132135
-Prunner=:runners:google-cloud-dataflow-java \
133136
-Prunner.version=V2 \
134-
-PtestJavaVersion=${{ matrix.java_version }} \
135-
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
137+
-PjavaVersion=${{ matrix.java_version }} \
138+
-Porg.gradle.java.installations.auto-detect=false \
139+
-Porg.gradle.java.installations.paths=$JAVA_HOME_${{ matrix.java_version }}_X64 \
136140
'-PloadTest.args=${{ env.beam_LoadTests_Java_ParDo_Dataflow_V2_Batch_JavaVersions_test_arguments_4 }} --appName=load_tests_Java${{ matrix.java_version }}_Dataflow_V2_batch_ParDo_4'

0 commit comments

Comments
 (0)