From e5ac5ed2b6c5586d43f6b57f41f5df42ff2d9455 Mon Sep 17 00:00:00 2001 From: peterxcli Date: Sun, 16 Mar 2025 20:34:45 +0800 Subject: [PATCH 1/2] java 8 -> 21 in intermittent-test-check --- .github/workflows/intermittent-test-check.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/intermittent-test-check.yml b/.github/workflows/intermittent-test-check.yml index 3f81934081fd..0123bc416800 100644 --- a/.github/workflows/intermittent-test-check.yml +++ b/.github/workflows/intermittent-test-check.yml @@ -48,6 +48,10 @@ on: description: Ratis ref (branch, tag or commit SHA) default: '' required: false + java-version: + description: Java version to use + default: '21' + required: true env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 TEST_CLASS: ${{ github.event.inputs.test-class}} @@ -56,6 +60,7 @@ env: FAIL_FAST: ${{ github.event.inputs.fail-fast }} RATIS_REPO: ${{ github.event.inputs.ratis-repo }} RATIS_VERSION: ${{ github.event.inputs.ratis-ref }} + JAVA_VERSION: ${{ github.event.inputs.java-version }} run-name: ${{ github.event_name == 'workflow_dispatch' && format('{0}#{1}[{2}]-{3}x{4}', inputs.test-class, inputs.test-name, inputs.ref, inputs.splits, inputs.iterations) || '' }} jobs: prepare-job: @@ -112,7 +117,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8 + java-version: ${{ github.event.inputs.java-version }} - name: Build (most) of Ozone run: | args="-DskipRecon -DskipShade -Dmaven.javadoc.skip=true" @@ -176,7 +181,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8 + java-version: ${{ github.event.inputs.java-version }} - name: Execute tests run: | if [[ -e "${{ steps.download-ozone-repo.outputs.download-path }}" ]]; then From dc6ae79dbdf56d7128ef0033626c54d03467320c Mon Sep 17 00:00:00 2001 From: peterxcli Date: Sun, 16 Mar 2025 20:41:07 +0800 Subject: [PATCH 2/2] include java version in run name --- .github/workflows/intermittent-test-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/intermittent-test-check.yml b/.github/workflows/intermittent-test-check.yml index 0123bc416800..1fe422ca042b 100644 --- a/.github/workflows/intermittent-test-check.yml +++ b/.github/workflows/intermittent-test-check.yml @@ -61,7 +61,7 @@ env: RATIS_REPO: ${{ github.event.inputs.ratis-repo }} RATIS_VERSION: ${{ github.event.inputs.ratis-ref }} JAVA_VERSION: ${{ github.event.inputs.java-version }} -run-name: ${{ github.event_name == 'workflow_dispatch' && format('{0}#{1}[{2}]-{3}x{4}', inputs.test-class, inputs.test-name, inputs.ref, inputs.splits, inputs.iterations) || '' }} +run-name: ${{ github.event_name == 'workflow_dispatch' && format('{0}#{1}[{2}]-{3}x{4}-java{5}', inputs.test-class, inputs.test-name, inputs.ref, inputs.splits, inputs.iterations, inputs.java-version) || '' }} jobs: prepare-job: runs-on: ubuntu-24.04