You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2024/07/01 05:37:01 UTC
(ozone) branch master updated: HDDS-11042. CI with Ratis ignores Ozone ref (#6838)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9513e0bac6 HDDS-11042. CI with Ratis ignores Ozone ref (#6838)
9513e0bac6 is described below
commit 9513e0bac6d1feabcf36c1d19be8bcd2e97a4180
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Mon Jul 1 07:36:57 2024 +0200
HDDS-11042. CI with Ratis ignores Ozone ref (#6838)
---
.github/workflows/ci-with-ratis.yml | 1 +
.github/workflows/ci.yml | 49 ++++++++++++++++++++++++++++++++++---
2 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci-with-ratis.yml b/.github/workflows/ci-with-ratis.yml
index 3c24f968eb..0c69b0e28c 100644
--- a/.github/workflows/ci-with-ratis.yml
+++ b/.github/workflows/ci-with-ratis.yml
@@ -50,3 +50,4 @@ jobs:
secrets: inherit
with:
ratis_args: "-Dratis.version=${{ needs.ratis.outputs.ratis-version }} -Dratis.thirdparty.version=${{ needs.ratis.outputs.thirdparty-version }} -Dio.grpc.version=${{ needs.ratis.outputs.grpc-version }} -Dnetty.version=${{ needs.ratis.outputs.netty-version }} -Dgrpc.protobuf-compile.version=${{ needs.ratis.outputs.protobuf-version }}"
+ ref: ${{ github.event.inputs.ref }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b897716028..830707dce2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,10 +21,15 @@ on:
description: Version overrides from custom Ratis build
default: ''
required: false
+ ref:
+ type: string
+ description: Ozone ref (branch, tag or commit SHA)
+ default: ''
+ required: false
env:
FAIL_FAST: ${{ github.event_name == 'pull_request' }}
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
- OZONE_WITH_COVERAGE: ${{ github.repository == 'apache/ozone' && github.event_name != 'pull_request' }}
+ OZONE_WITH_COVERAGE: ${{ github.repository == 'apache/ozone' && github.event_name == 'push' }}
jobs:
build-info:
runs-on: ubuntu-20.04
@@ -41,18 +46,35 @@ jobs:
needs-dependency-check: ${{ steps.selective-checks.outputs.needs-dependency-check }}
needs-integration-tests: ${{ steps.selective-checks.outputs.needs-integration-tests }}
needs-kubernetes-tests: ${{ steps.selective-checks.outputs.needs-kubernetes-tests }}
+ sha: ${{ steps.get-sha.outputs.sha }}
steps:
- - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+ - name: "Checkout ${{ github.ref }} / ${{ github.sha }} (push)"
uses: actions/checkout@v4
with:
persist-credentials: false
- - name: Fetch incoming commit ${{ github.sha }} with its parent
+ if: github.event_name == 'push'
+ - name: "Checkout ${{ github.sha }} with its parent (pull request)"
uses: actions/checkout@v4
with:
ref: ${{ github.sha }}
fetch-depth: 2
persist-credentials: false
if: github.event_name == 'pull_request'
+ - name: "Checkout ${{ inputs.ref }} given in workflow input (manual dispatch)"
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ inputs.ref }}
+ persist-credentials: false
+ if: github.event_name == 'workflow_dispatch'
+ - name: Get SHA of ${{ inputs.ref || github.ref }}
+ id: get-sha
+ run: |
+ if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
+ sha="$(git rev-parse --verify HEAD)"
+ else
+ sha="${GITHUB_SHA}"
+ fi
+ echo "sha=$sha" >> $GITHUB_OUTPUT
- name: Selective checks
id: selective-checks
env:
@@ -87,6 +109,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Cache for npm dependencies
uses: actions/cache@v4
with:
@@ -211,11 +235,14 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
if: matrix.check != 'bats'
- name: Checkout project with history
uses: actions/checkout@v4
with:
fetch-depth: 0
+ ref: ${{ needs.build-info.outputs.sha }}
if: matrix.check == 'bats'
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
@@ -264,6 +291,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
with:
@@ -310,6 +339,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Download compiled Ozone binaries
uses: actions/download-artifact@v4
with:
@@ -339,6 +370,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
with:
@@ -384,6 +417,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Download compiled Ozone binaries
uses: actions/download-artifact@v4
with:
@@ -426,6 +461,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Download compiled Ozone binaries
uses: actions/download-artifact@v4
with:
@@ -475,6 +512,8 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v4
+ with:
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
with:
@@ -520,8 +559,9 @@ jobs:
coverage:
runs-on: ubuntu-20.04
timeout-minutes: 30
- if: github.repository == 'apache/ozone' && github.event_name != 'pull_request'
+ if: github.repository == 'apache/ozone' && github.event_name == 'push'
needs:
+ - build-info
- acceptance
- integration
- native
@@ -530,6 +570,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
+ ref: ${{ needs.build-info.outputs.sha }}
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
with:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org