From 8e7e22af734a69af4e743e656c64ca70fb22e46d Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Mon, 10 Feb 2025 21:23:06 +0100 Subject: [PATCH 1/3] HDDS-12304. Bump GitHub Actions runner to ubuntu-24.04 --- .github/workflows/build-ratis.yml | 6 ++--- .github/workflows/ci.yml | 24 +++++++++---------- .github/workflows/close-pending.yaml | 2 +- .github/workflows/comments.yaml | 2 +- .github/workflows/intermittent-test-check.yml | 8 +++---- .github/workflows/populate-cache.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/repeat-acceptance.yml | 6 ++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-ratis.yml b/.github/workflows/build-ratis.yml index 201a62e85f10..b54d7ec6d55d 100644 --- a/.github/workflows/build-ratis.yml +++ b/.github/workflows/build-ratis.yml @@ -58,7 +58,7 @@ env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 jobs: ratis: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 outputs: ratis-version: ${{ steps.versions.outputs.ratis }} @@ -102,7 +102,7 @@ jobs: ~/.m2/repository/org/apache/ratis retention-days: 1 ratis-thirdparty: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: - ratis timeout-minutes: 30 @@ -123,7 +123,7 @@ jobs: echo "netty=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.netty.version)" >> $GITHUB_OUTPUT echo "protobuf=$(mvn help:evaluate -N -q -DforceStdout -Dscan=false -Dexpression=shaded.protobuf.version)" >> $GITHUB_OUTPUT debug: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: - ratis - ratis-thirdparty diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4446e79d93a..bd4111b4c062 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ env: OZONE_WITH_COVERAGE: ${{ github.event_name == 'push' }} jobs: build-info: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: GITHUB_CONTEXT: ${{ toJson(github) }} outputs: @@ -108,7 +108,7 @@ jobs: build: needs: - build-info - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 if: needs.build-info.outputs.needs-build == 'true' steps: @@ -192,7 +192,7 @@ jobs: matrix: java: [ 11, 17, 21 ] include: - - os: ubuntu-20.04 + - os: ubuntu-24.04 - java: 8 os: macos-13 fail-fast: false @@ -247,7 +247,7 @@ jobs: basic: needs: - build-info - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 if: needs.build-info.outputs.needs-basic-check == 'true' strategy: @@ -306,7 +306,7 @@ jobs: needs: - build-info - basic - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 150 if: needs.build-info.outputs.needs-native-check == 'true' steps: @@ -353,7 +353,7 @@ jobs: needs: - build-info - build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 5 steps: - name: Checkout project @@ -392,7 +392,7 @@ jobs: needs: - build-info - build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 15 steps: - name: Checkout project @@ -440,7 +440,7 @@ jobs: - basic - dependency - license - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - name: Checkout project @@ -497,7 +497,7 @@ jobs: - basic - dependency - license - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 150 if: needs.build-info.outputs.needs-compose-tests == 'true' strategy: @@ -550,7 +550,7 @@ jobs: - basic - dependency - license - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 if: needs.build-info.outputs.needs-kubernetes-tests == 'true' steps: @@ -592,7 +592,7 @@ jobs: needs: - build-info - basic - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 150 if: needs.build-info.outputs.needs-integration-tests == 'true' strategy: @@ -645,7 +645,7 @@ jobs: path: target/integration continue-on-error: true coverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 if: github.event_name == 'push' needs: diff --git a/.github/workflows/close-pending.yaml b/.github/workflows/close-pending.yaml index ce18152407d0..3dfe736cd39d 100644 --- a/.github/workflows/close-pending.yaml +++ b/.github/workflows/close-pending.yaml @@ -21,7 +21,7 @@ on: jobs: close-pending: name: close-pending - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/comments.yaml b/.github/workflows/comments.yaml index 8f7d41c2bda4..d10b94759813 100644 --- a/.github/workflows/comments.yaml +++ b/.github/workflows/comments.yaml @@ -23,7 +23,7 @@ on: jobs: process-comment: name: check-comment - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/intermittent-test-check.yml b/.github/workflows/intermittent-test-check.yml index 4154d1a9ac30..3f81934081fd 100644 --- a/.github/workflows/intermittent-test-check.yml +++ b/.github/workflows/intermittent-test-check.yml @@ -59,7 +59,7 @@ env: 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: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 outputs: matrix: ${{steps.generate.outputs.matrix}} steps: @@ -87,7 +87,7 @@ jobs: needs: - prepare-job - ratis - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 steps: - name: Checkout project @@ -139,7 +139,7 @@ jobs: - ratis - build name: Run-Split - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: split: ${{fromJson(needs.prepare-job.outputs.matrix)}} # Define splits @@ -216,7 +216,7 @@ jobs: count-failures: if: ${{ failure() }} needs: run-test - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Download build results uses: actions/download-artifact@v4 diff --git a/.github/workflows/populate-cache.yml b/.github/workflows/populate-cache.yml index 94f2ccfe52da..f2a6843f6912 100644 --- a/.github/workflows/populate-cache.yml +++ b/.github/workflows/populate-cache.yml @@ -31,7 +31,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout project uses: actions/checkout@v4 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 53ba44e0f2fb..7ccbb9ef20a8 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -25,7 +25,7 @@ on: jobs: title: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout project uses: actions/checkout@v4 diff --git a/.github/workflows/repeat-acceptance.yml b/.github/workflows/repeat-acceptance.yml index b4e7b42fcb50..252e93518cc6 100644 --- a/.github/workflows/repeat-acceptance.yml +++ b/.github/workflows/repeat-acceptance.yml @@ -51,7 +51,7 @@ env: run-name: ${{ github.event_name == 'workflow_dispatch' && format('{0}[{1}]-{2}', inputs.test-suite || inputs.test-filter, inputs.ref, inputs.splits) || '' }} jobs: prepare-job: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 outputs: matrix: ${{steps.generate.outputs.matrix}} steps: @@ -76,7 +76,7 @@ jobs: build: needs: - prepare-job - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 steps: - name: Checkout project @@ -124,7 +124,7 @@ jobs: - prepare-job - build name: Run-Split - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: split: ${{ fromJson(needs.prepare-job.outputs.matrix) }} From f526d40dfc40076d5027211250d10bc1d32cb5e6 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 11 Feb 2025 08:24:48 +0100 Subject: [PATCH 2/3] acceptance (s3a) requires java --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd4111b4c062..a18e87ea51d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -527,6 +527,11 @@ jobs: mkdir -p hadoop-ozone/dist/target tar xzvf ozone*.tar.gz -C hadoop-ozone/dist/target rm ozone*.tar.gz + - name: Setup java ${{ env.TEST_JAVA_VERSION }} + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ env.TEST_JAVA_VERSION }} - name: Execute tests run: | ./hadoop-ozone/dev-support/checks/acceptance.sh From 4812f8490753915a3a83630e31f4d495c7b75b39 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 11 Feb 2025 08:56:25 +0100 Subject: [PATCH 3/3] use Java 11 for acceptance --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a18e87ea51d0..87193106c287 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -527,11 +527,11 @@ jobs: mkdir -p hadoop-ozone/dist/target tar xzvf ozone*.tar.gz -C hadoop-ozone/dist/target rm ozone*.tar.gz - - name: Setup java ${{ env.TEST_JAVA_VERSION }} + - name: Setup java 11 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: ${{ env.TEST_JAVA_VERSION }} + java-version: 11 # Hadoop may not work with newer Java - name: Execute tests run: | ./hadoop-ozone/dev-support/checks/acceptance.sh