Skip to content

Commit

Permalink
Bump to Java11 for GHA runner
Browse files Browse the repository at this point in the history
Bump default gradle to 8.4 on GHA runner

Remove explicit ref to java8 in GHA; bump default GHA java version to 11
  • Loading branch information
Abacn committed Aug 12, 2024
1 parent cae9148 commit 4da043d
Show file tree
Hide file tree
Showing 31 changed files with 211 additions and 240 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-environment-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ runs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ inputs.java-version == 'default' && '8' || inputs.java-version }}
java-version: ${{ inputs.java-version == 'default' && '11' || inputs.java-version }}
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/gh-actions-self-hosted-runners/arc/images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \
rm go${go_version}.linux-amd64.tar.gz
ENV PATH="${PATH}:/usr/local/go/bin"
#Install Java
RUN curl -OL https://cdn.azul.com/zulu/bin/zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
tar -C /usr/local -xzf zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
rm zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
mv /usr/local/zulu8.70.0.23-ca-jdk8.0.372-linux_x64 /usr/local/java
RUN curl -OL https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
tar -C /usr/local -xzf zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
rm zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
mv /usr/local/zulu11.74.15-ca-jdk11.0.24-linux_x64 /usr/local/java
ENV PATH="${PATH}:/usr/local/java/bin"
#Install Gradle
RUN curl -OL https://services.gradle.org/distributions/gradle-7.3.3-bin.zip && \
unzip gradle-7.3.3-bin.zip && \
rm gradle-7.3.3-bin.zip && \
mv gradle-7.3.3 /usr/local/gradle
RUN curl -OL https://services.gradle.org/distributions/gradle-8.4-bin.zip && \
unzip gradle-8.4-bin.zip && \
rm gradle-8.4-bin.zip && \
mv gradle-8.4 /usr/local/gradle
ENV PATH="${PATH}:/usr/local/gradle/bin"
#Install GitHub CLI
RUN curl -OL https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz && \
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: LoadTests Java GBK Dataflow V2 Batch Java11
name: LoadTests Java GBK Dataflow V2 Batch

on:
schedule:
Expand Down Expand Up @@ -49,18 +49,18 @@ env:
INFLUXDB_USER_PASSWORD: ${{ secrets.INFLUXDB_USER_PASSWORD }}

jobs:
beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11:
beam_LoadTests_Java_GBK_Dataflow_V2_Batch:
if: |
github.event_name == 'workflow_dispatch' ||
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
github.event.comment.body == 'Run Load Tests Java 11 GBK Dataflow V2 Batch'
github.event.comment.body == 'Run Load Tests GBK Dataflow V2 Batch'
runs-on: [self-hosted, ubuntu-20.04, main]
timeout-minutes: 240
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
strategy:
matrix:
job_name: ["beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11"]
job_phrase: ["Run Load Tests Java 11 GBK Dataflow V2 Batch"]
job_name: ["beam_LoadTests_Java_GBK_Dataflow_V2_Batch"]
job_phrase: ["Run Load Tests GBK Dataflow V2 Batch"]
steps:
- uses: actions/checkout@v4
- name: Setup repository
Expand All @@ -72,20 +72,20 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 11
java-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
test-type: load
test-language: java
argument-file-paths: |
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_2GB_of_10B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_2GB_of_100B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_2GB_of_100kB_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_fanout_4_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_fanout_8_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_reiterate_4_times_10kB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_Java11_reiterate_4_times_2MB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_2GB_of_10B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_2GB_of_100B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_2GB_of_100kB_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_fanout_4_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_fanout_8_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_reiterate_4_times_10kB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Batch_reiterate_4_times_2MB_values.txt
# The env variables are created and populated in the test-arguments-action as "<github.job>_test_arguments_<argument_file_paths_index>"
- name: run Load test 2GB of 10B records
uses: ./.github/actions/gradle-command-self-hosted-action
Expand All @@ -95,9 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_1 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -106,9 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_2 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -117,9 +113,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_3 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -128,9 +122,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_4 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -139,9 +131,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_5 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -150,9 +140,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_6 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -161,6 +149,4 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_7 }}'
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_test_arguments_7 }}'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: LoadTests Java GBK Dataflow V2 Streaming Java11
name: LoadTests Java GBK Dataflow V2 Streaming

on:
schedule:
Expand Down Expand Up @@ -49,7 +49,7 @@ env:
INFLUXDB_USER_PASSWORD: ${{ secrets.INFLUXDB_USER_PASSWORD }}

jobs:
beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11:
beam_LoadTests_Java_GBK_Dataflow_V2_Streaming:
if: |
github.event_name == 'workflow_dispatch' ||
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
Expand All @@ -59,8 +59,8 @@ jobs:
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
strategy:
matrix:
job_name: ["beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11"]
job_phrase: ["Run Load Tests Java 11 GBK Dataflow V2 Streaming"]
job_name: ["beam_LoadTests_Java_GBK_Dataflow_V2_Streaming"]
job_phrase: ["Run Load Tests GBK Dataflow V2 Streaming"]
steps:
- uses: actions/checkout@v4
- name: Setup repository
Expand All @@ -72,20 +72,20 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 11
java-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
test-type: load
test-language: java
argument-file-paths: |
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_2GB_of_10B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_2GB_of_100B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_2GB_of_100kB_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_fanout_4_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_fanout_8_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_reiterate_4_times_10kB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_Java11_reiterate_4_times_2MB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_2GB_of_10B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_2GB_of_100B_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_2GB_of_100kB_records.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_fanout_4_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_fanout_8_times_with_2GB_10-byte_records_total.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_reiterate_4_times_10kB_values.txt
${{ github.workspace }}/.github/workflows/load-tests-pipeline-options/java_GBK_Dataflow_V2_Streaming_reiterate_4_times_2MB_values.txt
# The env variables are created and populated in the test-arguments-action as "<github.job>_test_arguments_<argument_file_paths_index>"
- name: run Load test 2GB of 10B records
uses: ./.github/actions/gradle-command-self-hosted-action
Expand All @@ -95,9 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_1 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -106,9 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_2 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -117,9 +113,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_3 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -128,9 +122,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_4 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -139,9 +131,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_5 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -150,9 +140,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_6 }}' \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -161,6 +149,4 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
-PtestJavaVersion=11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_7 }}'
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_test_arguments_7 }}'
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
matrix:
job_name: [beam_PostCommit_Java_Examples_Dataflow_Java]
job_phrase: [Run Java examples on Dataflow Java]
java_version: ['11','17','21']
java_version: ['8','17','21']
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'pull_request_target' ||
Expand All @@ -79,7 +79,7 @@ jobs:
with:
java-version: |
${{ matrix.java_version }}
8
11
- name: run java${{ matrix.java_version }}PostCommit script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
job_name: [beam_PostCommit_Java_Examples_Dataflow_V2_Java]
job_phrase_1: [Run Java ]
job_phrase_2: [Examples on Dataflow Runner V2]
java_version: ['11', '17', '21']
java_version: ['8', '17', '21']
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'pull_request_target' ||
Expand All @@ -81,7 +81,7 @@ jobs:
with:
java-version: |
${{ matrix.java_version }}
8
11
- name: run PostCommit Java Examples Dataflow V2 Java${{ matrix.java_version }} script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Loading

0 comments on commit 4da043d

Please sign in to comment.