Skip to content

Commit

Permalink
Revert "Setup Java 21 container (apache#28833)" (apache#28968)
Browse files Browse the repository at this point in the history
This reverts commit e8e3814.
  • Loading branch information
damccorm authored and damondouglas committed Oct 16, 2023
1 parent 6d176f5 commit 992627b
Show file tree
Hide file tree
Showing 50 changed files with 132 additions and 220 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -105,7 +105,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -115,7 +115,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -125,7 +125,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -105,7 +105,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -115,7 +115,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand All @@ -125,7 +125,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
-PtestJavaVersion=${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -104,7 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -115,7 +115,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -126,7 +126,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -137,7 +137,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -148,7 +148,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -159,6 +159,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_7 }}'
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 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_7 }}'
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -104,7 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -115,7 +115,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -126,7 +126,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -137,7 +137,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -148,7 +148,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-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 @@ -159,6 +159,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_7 }}'
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 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-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 @@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=17 \
-PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_7 }}'
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: |
-PtestJavaVersion${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-Pcontainer-architecture-list=arm64,amd64 \
-Ppush-containers \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
-PtestJavaVersion${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ 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
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest
arguments:
-PskipCheckerFramework
-PtestJavaVersion=17
-PcompileAndRunTestsWithJava17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:directRunnerIntegrationTest
arguments:
-PskipCheckerFramework
-PtestJavaVersion=17
-PcompileAndRunTestsWithJava17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:nexmark:run
arguments: |
-PtestJavaVersion${{ matrix.java_version }} \
-PcompileAndRunTestsWithJava${{ 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
Loading

0 comments on commit 992627b

Please sign in to comment.