Skip to content

Commit

Permalink
Enable run test on Java 21
Browse files Browse the repository at this point in the history
* upgrade gradle 8,3 -> 8.4

* Use temurin 21 base image as its available now

* Setup a few Java21 postcommits

* Fix kotlin test

* Fix javaVersion to be 1.8/11/17/21
  • Loading branch information
Abacn committed Oct 12, 2023
1 parent 4a7c484 commit f67cfa7
Show file tree
Hide file tree
Showing 18 changed files with 279 additions and 175 deletions.
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 }} \
-PtestJavaVersion=${{ 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 @@ -59,7 +59,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']
java_version: ['11', '17', '21']
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'schedule' ||
Expand All @@ -77,7 +77,9 @@ jobs:
uses: actions/setup-java@v3.8.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java_version }}
java-version: |
${{ matrix.java_version }}
8
- name: run PostCommit Java Examples Dataflow V2 Java${{ matrix.java_version }} script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand All @@ -86,7 +88,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
-PtestJavaVersion${{ 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
97 changes: 97 additions & 0 deletions .github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: PostCommit Java Jpms Direct Java21

on:
schedule:
- cron: '0 */6 * * *'
workflow_dispatch:

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: write
checks: write
contents: read
deployments: read
id-token: none
issues: write
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.event.pull_request.head.label || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login}}'
cancel-in-progress: true

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}

jobs:
beam_PostCommit_Java_Jpms_Direct_Java21:
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'schedule' ||
github.event.comment.body == 'Run Jpms Direct Java 21 PostCommit'
runs-on: [self-hosted, ubuntu-20.04, main]
timeout-minutes: 240
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
strategy:
matrix:
job_name: ["beam_PostCommit_Java_Jpms_Direct_Java21"]
job_phrase: ["Run Jpms Direct Java 21 PostCommit"]
steps:
- uses: actions/checkout@v4
- name: Setup repository
uses: ./.github/actions/setup-action
with:
comment_phrase: ${{ matrix.job_phrase }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
- name: Set up Java
uses: actions/setup-java@v3.11.0
with:
distribution: 'temurin'
java-version: |
21
8
- name: run PostCommit Java Jpms Direct Java21 script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :sdks:java:testing:jpms-tests:directRunnerIntegrationTest
arguments:
-PskipCheckerFramework
-PtestJavaVersion=21
-Pjava21Home=$JAVA_HOME_21_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
if: failure()
with:
name: JUnit Test Results
path: "**/build/reports/tests/"
- name: Publish JUnit Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
commit: '${{ env.prsha || env.GITHUB_SHA }}'
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
files: '**/build/test-results/**/*.xml'
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 }} \
-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
Loading

0 comments on commit f67cfa7

Please sign in to comment.