This is an automated email from the ASF dual-hosted git repository.
sarvekshayr 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 12635659b13 HDDS-16605. Reduce noise from failed copy-jar in
integration check (#11326)
12635659b13 is described below
commit 12635659b13637a1779888b395df9419a2511255
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Sep 30 07:13:04 2026 +0200
HDDS-16605. Reduce noise from failed copy-jar in integration check (#11326)
---
hadoop-ozone/dev-support/checks/integration.sh | 22 +++++++++++++++-------
hadoop-ozone/dev-support/checks/junit.sh | 3 ++-
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/hadoop-ozone/dev-support/checks/integration.sh
b/hadoop-ozone/dev-support/checks/integration.sh
index c70c098dbf7..b1042d8500a 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/hadoop-ozone/dev-support/checks/integration.sh
@@ -17,15 +17,23 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
CHECK=integration
ERROR_PATTERN="\[ERROR\]"
+PHASE=test
args=""
-if [[ "$@" =~ "-Ptest-flaky" ]]; then
- args="$args -Dsurefire.rerunFailingTestsCount=5 -Dsurefire.fork.timeout=3600"
- # tests may pass on re-run, so we cannot rely on output for status
- ERROR_PATTERN=""
-fi
-if [[ "$@" =~ "-Ptest-" ]] && [[ ! "$@" =~ "-Ptest-filesystem" ]]; then
- args="$args -DskipShade"
+
+if [[ "$@" =~ "-Ptest-" ]]; then
+ if [[ "$@" =~ "-Ptest-flaky" ]]; then
+ args="$args -Dsurefire.rerunFailingTestsCount=5
-Dsurefire.fork.timeout=3600"
+ # tests may pass on re-run, so we cannot rely on output for status
+ ERROR_PATTERN=""
+ fi
+
+ if [[ "$@" =~ "-Ptest-filesystem" ]]; then
+ # shading is performed in `package` phase, which is after `test`
+ PHASE=verify
+ else
+ args="$args -DskipShade"
+ fi
fi
source "${DIR}/junit.sh" $args "$@"
diff --git a/hadoop-ozone/dev-support/checks/junit.sh
b/hadoop-ozone/dev-support/checks/junit.sh
index 9f06ff3bd10..7d01cc66b22 100755
--- a/hadoop-ozone/dev-support/checks/junit.sh
+++ b/hadoop-ozone/dev-support/checks/junit.sh
@@ -28,6 +28,7 @@ cd "$DIR/../../.." || exit 1
: ${ITERATIONS:="1"}
: ${OZONE_WITH_COVERAGE:="false"}
: ${OZONE_REPO_CACHED:="false"}
+: ${PHASE:="verify"}
declare -i ITERATIONS
if [[ ${ITERATIONS} -le 0 ]]; then
@@ -77,7 +78,7 @@ for i in $(seq 1 ${ITERATIONS}); do
mkdir -p "${REPORT_DIR}"
fi
- mvn ${MAVEN_OPTIONS}
-Dmaven-surefire-plugin.argLineAccessArgs="${OZONE_MODULE_ACCESS_ARGS}" "$@"
verify \
+ mvn ${MAVEN_OPTIONS}
-Dmaven-surefire-plugin.argLineAccessArgs="${OZONE_MODULE_ACCESS_ARGS}" "$@"
"${PHASE}" \
| tee "${REPORT_DIR}/output.log"
irc=$?
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
