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 b13039599f HDDS-9485. Let integration check reuse Ozone jars from
build check (#5460)
b13039599f is described below
commit b13039599f43ee76f04f22dd8df57696fb17901f
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Oct 19 13:30:24 2023 +0200
HDDS-9485. Let integration check reuse Ozone jars from build check (#5460)
---
.github/workflows/ci.yml | 33 ++++++++++++++++++++++++++------
hadoop-ozone/dev-support/checks/junit.sh | 5 ++++-
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a55a7e75dd..1a25813b9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,6 +120,13 @@ jobs:
name: ozone-src
path: hadoop-ozone/dist/target/ozone-*-src.tar.gz
retention-days: 1
+ - name: Store Maven repo for tests
+ uses: actions/upload-artifact@v3
+ with:
+ name: ozone-repo
+ path: |
+ ~/.m2/repository/org/apache/ozone
+ retention-days: 1
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
@@ -412,19 +419,33 @@ jobs:
maven-repo-${{ hashFiles('**/pom.xml') }}-8
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
+ - name: Download Ozone repo
+ id: download-ozone-repo
+ uses: actions/download-artifact@v3
+ with:
+ name: ozone-repo
+ path: |
+ ~/.m2/repository/org/apache/ozone
+ continue-on-error: true
- name: Setup java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
- name: Execute tests
- run: hadoop-ozone/dev-support/checks/integration.sh -P${{
matrix.profile }}
- if: matrix.profile != 'flaky'
- continue-on-error: true
- - name: Execute flaky tests
- run: hadoop-ozone/dev-support/checks/integration.sh -P${{
matrix.profile }} -Dsurefire.rerunFailingTestsCount=5
-Dsurefire.fork.timeout=3600
- if: matrix.profile == 'flaky'
continue-on-error: true
+ run: |
+ if [[ -e "${{ steps.download-ozone-repo.outputs.download-path }}"
]]; then
+ export OZONE_REPO_CACHED=true
+ fi
+
+ args=
+ if [[ "${{ matrix.profile }}" == "flaky" ]]; then
+ args="-Dsurefire.rerunFailingTestsCount=5
-Dsurefire.fork.timeout=3600"
+ fi
+
+ hadoop-ozone/dev-support/checks/integration.sh -P${{ matrix.profile
}} ${args}
+
- name: Summary of failures
run: hadoop-ozone/dev-support/checks/_summary.sh target/${{ github.job
}}/summary.txt
if: ${{ !cancelled() }}
diff --git a/hadoop-ozone/dev-support/checks/junit.sh
b/hadoop-ozone/dev-support/checks/junit.sh
index 74cefe6a97..2b0865f1c2 100755
--- a/hadoop-ozone/dev-support/checks/junit.sh
+++ b/hadoop-ozone/dev-support/checks/junit.sh
@@ -22,6 +22,7 @@ cd "$DIR/../../.." || exit 1
: ${CHECK:="unit"}
: ${ITERATIONS:="1"}
: ${OZONE_WITH_COVERAGE:="false"}
+: ${OZONE_REPO_CACHED:="false"}
declare -i ITERATIONS
if [[ ${ITERATIONS} -le 0 ]]; then
@@ -42,7 +43,9 @@ else
fi
if [[ "${CHECK}" == "integration" ]] || [[ ${ITERATIONS} -gt 1 ]]; then
- mvn ${MAVEN_OPTIONS} -DskipTests clean install
+ if [[ ${OZONE_REPO_CACHED} == "false" ]]; then
+ mvn ${MAVEN_OPTIONS} -DskipTests clean install
+ fi
fi
REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/${CHECK}"}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
