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 2d87299dee HDDS-12140. Replace leftover rebot in
k8s/examples/test-all.sh (#7756)
2d87299dee is described below
commit 2d87299dee5052e14660313a0e7f827fc028a00c
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 28 14:12:43 2025 +0100
HDDS-12140. Replace leftover rebot in k8s/examples/test-all.sh (#7756)
---
hadoop-ozone/dist/src/main/k8s/examples/test-all.sh | 4 +++-
hadoop-ozone/dist/src/main/k8s/examples/testlib.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
b/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
index 6f72fc7e6c..e231c49041 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
@@ -22,6 +22,8 @@ set -u -o pipefail
#
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )
+source "${SCRIPT_DIR}/testlib.sh"
+
ALL_RESULT_DIR="$SCRIPT_DIR/result"
rm "$ALL_RESULT_DIR"/* || true
mkdir -p "$ALL_RESULT_DIR"
@@ -51,6 +53,6 @@ for test in $(find "$SCRIPT_DIR" -name test.sh | grep
"${OZONE_TEST_SELECTOR:-""
fi
done
-rebot -N "smoketests" -d "$ALL_RESULT_DIR/" "$ALL_RESULT_DIR/*.xml"
+run_rebot "$ALL_RESULT_DIR" "$ALL_RESULT_DIR" "-N smoketests *.xml"
exit ${RESULT}
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
index a075d8d181..1ae4dd9848 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
@@ -170,7 +170,7 @@ execute_robot_test() {
combine_reports() {
if [[ -d result ]]; then
rm -f result/output.xml
- run_rebot result result -o output.xml -N "$(basename "$(pwd)")"
result/*.xml
+ run_rebot result result "-o output.xml -N '$(basename $(pwd))' *.xml"
fi
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
