Skip to content

HDDS-12500. Do not skip JUnit tests in post-commit runs #8024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fapifta merged 3 commits into from
Mar 26, 2025
Merged

HDDS-12500. Do not skip JUnit tests in post-commit runs #8024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59bae24
HDDS-12500. Do not skip JUnit tests in post-commit runs
adoroszlai Mar 7, 2025
45b0b21
mvn clean before tests
adoroszlai Mar 7, 2025
b5c9cb5
allow individual errors (for flaky check)
adoroszlai Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hadoop-ozone/dev-support/checks/_post_process.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
# - $REPORT_FILE should be defined
# - Maven output should be saved in $REPORT_DIR/output.log

# script failed, but report file is empty (does not reflect failure)
if [[ ${rc} -ne 0 ]] && [[ ! -s "${REPORT_FILE}" ]]; then
# do we know what to look for?
if [[ ! -s "${REPORT_FILE}" ]]; then
# check if there are errors in the log
if [[ -n "${ERROR_PATTERN:-}" ]]; then
grep -m25 "${ERROR_PATTERN}" "${REPORT_DIR}/output.log" > "${REPORT_FILE}"
fi
if [[ ! -s "${REPORT_FILE}" ]]; then
# script failed, but report file is empty (does not reflect failure)
if [[ ${rc} -ne 0 ]] && [[ ! -s "${REPORT_FILE}" ]]; then
echo "Unknown failure, check output.log" > "${REPORT_FILE}"
fi
fi
Expand Down
8 changes: 5 additions & 3 deletions hadoop-ozone/dev-support/checks/junit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fi
if [[ "${FAIL_FAST}" == "true" ]]; then
MAVEN_OPTIONS="${MAVEN_OPTIONS} --fail-fast -Dsurefire.skipAfterFailureCount=1"
else
MAVEN_OPTIONS="${MAVEN_OPTIONS} --fail-at-end"
MAVEN_OPTIONS="${MAVEN_OPTIONS} --fail-never"
fi

# apply module access args (for Java 9+)
Expand All @@ -50,8 +50,10 @@ if [[ -f hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh ]]; then
ozone_java_setup
fi

mvn ${MAVEN_OPTIONS} clean

if [[ ${ITERATIONS} -gt 1 ]] && [[ ${OZONE_REPO_CACHED} == "false" ]]; then
mvn ${MAVEN_OPTIONS} -DskipTests clean install
mvn ${MAVEN_OPTIONS} -DskipTests install
fi

REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/${CHECK}"}
Expand Down Expand Up @@ -105,5 +107,5 @@ if [[ "${OZONE_WITH_COVERAGE}" == "true" ]]; then
mvn -B -N jacoco:merge -Djacoco.destFile=$REPORT_DIR/jacoco-combined.exec -Dscan=false
fi

ERROR_PATTERN="\[ERROR\]"
ERROR_PATTERN="BUILD FAILURE"
source "${DIR}/_post_process.sh"