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 3f54b1452c5 HDDS-13892. Allow flaky-test-check to be cancelled through
the GitHub UI (#9260)
3f54b1452c5 is described below
commit 3f54b1452c5b725431c69ca25e0bb2a3d400894e
Author: Peter Lee <[email protected]>
AuthorDate: Fri Nov 7 20:23:40 2025 +0800
HDDS-13892. Allow flaky-test-check to be cancelled through the GitHub UI
(#9260)
---
.github/workflows/intermittent-test-check.yml | 4 ++--
hadoop-ozone/dev-support/checks/junit.sh | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/intermittent-test-check.yml
b/.github/workflows/intermittent-test-check.yml
index 1263bcfdc90..1dffcd8a967 100644
--- a/.github/workflows/intermittent-test-check.yml
+++ b/.github/workflows/intermittent-test-check.yml
@@ -95,7 +95,7 @@ jobs:
repo: ${{ github.event.inputs.ratis-repo || format('{0}/ratis',
github.repository_owner) }}
ref: ${{ github.event.inputs.ratis-ref }}
build:
- if: ${{ always() }}
+ if: ${{ !cancelled() }}
needs:
- prepare-job
- ratis
@@ -149,7 +149,7 @@ jobs:
~/.m2/repository/org/apache/ozone
retention-days: 1
run-test:
- if: ${{ always() }}
+ if: ${{ !cancelled() }}
needs:
- prepare-job
- ratis
diff --git a/hadoop-ozone/dev-support/checks/junit.sh
b/hadoop-ozone/dev-support/checks/junit.sh
index 6b3abaa443d..71947ff8433 100755
--- a/hadoop-ozone/dev-support/checks/junit.sh
+++ b/hadoop-ozone/dev-support/checks/junit.sh
@@ -16,6 +16,10 @@
set -u -o pipefail
+# Handle cancellation signals
+cancelled=false
+trap 'cancelled=true; echo "Caught cancellation signal, exiting..."; exit 130'
SIGINT SIGTERM
+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd "$DIR/../../.." || exit 1
@@ -62,6 +66,11 @@ mkdir -p "$REPORT_DIR"
rc=0
for i in $(seq 1 ${ITERATIONS}); do
+ if [[ "${cancelled}" == "true" ]]; then
+ echo "Cancellation detected, stopping test iterations"
+ break
+ fi
+
if [[ ${ITERATIONS} -gt 1 ]]; then
original_report_dir="${REPORT_DIR}"
REPORT_DIR="${original_report_dir}/iteration${i}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
