You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2020/08/27 08:57:28 UTC
[hadoop-ozone] branch master updated: HDDS-4152. Archive container
logs for kubernetes check (#1355)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5fab834 HDDS-4152. Archive container logs for kubernetes check (#1355)
5fab834 is described below
commit 5fab8343c8e798b71b17d918efbddb41e7cc05fb
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Thu Aug 27 10:56:56 2020 +0200
HDDS-4152. Archive container logs for kubernetes check (#1355)
---
hadoop-ozone/dev-support/checks/kubernetes.sh | 2 +-
.../dist/src/main/k8s/examples/getting-started/test.sh | 2 ++
hadoop-ozone/dist/src/main/k8s/examples/minikube/test.sh | 2 ++
hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/test.sh | 2 ++
hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh | 2 ++
hadoop-ozone/dist/src/main/k8s/examples/test-all.sh | 11 ++++++++---
hadoop-ozone/dist/src/main/k8s/examples/testlib.sh | 7 +++++++
7 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/hadoop-ozone/dev-support/checks/kubernetes.sh b/hadoop-ozone/dev-support/checks/kubernetes.sh
index a23aa83..7f68da1 100755
--- a/hadoop-ozone/dev-support/checks/kubernetes.sh
+++ b/hadoop-ozone/dev-support/checks/kubernetes.sh
@@ -31,6 +31,6 @@ mkdir -p "$REPORT_DIR"
cd "$DIST_DIR/kubernetes/examples" || exit 1
./test-all.sh
RES=$?
-cp result/* "$REPORT_DIR/"
+cp -r result/* "$REPORT_DIR/"
cp "$REPORT_DIR/log.html" "$REPORT_DIR/summary.html"
exit $RES
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/test.sh b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/test.sh
index dabe394..7d6bdfb 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/test.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/test.sh
@@ -32,6 +32,8 @@ execute_robot_test scm-0 smoketest/basic/basic.robot
combine_reports
+get_logs
+
stop_k8s_env
revert_resources
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/minikube/test.sh b/hadoop-ozone/dist/src/main/k8s/examples/minikube/test.sh
index dabe394..7d6bdfb 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/test.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/test.sh
@@ -32,6 +32,8 @@ execute_robot_test scm-0 smoketest/basic/basic.robot
combine_reports
+get_logs
+
stop_k8s_env
revert_resources
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/test.sh b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/test.sh
index dabe394..7d6bdfb 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/test.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/test.sh
@@ -32,6 +32,8 @@ execute_robot_test scm-0 smoketest/basic/basic.robot
combine_reports
+get_logs
+
stop_k8s_env
revert_resources
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh b/hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh
index dabe394..7d6bdfb 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh
@@ -32,6 +32,8 @@ execute_robot_test scm-0 smoketest/basic/basic.robot
combine_reports
+get_logs
+
stop_k8s_env
revert_resources
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 1d763ff..ae810c9 100755
--- a/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/test-all.sh
@@ -31,13 +31,18 @@ RESULT=0
IFS=$'\n'
# shellcheck disable=SC2044
for test in $(find "$SCRIPT_DIR" -name test.sh | grep "${OZONE_TEST_SELECTOR:-""}" |sort); do
+ TEST_DIR="$(dirname $test)"
+ TEST_NAME="$(basename "$TEST_DIR")"
+
echo ""
- echo "#### Executing tests of $(dirname "$test") #####"
+ echo "#### Executing tests of ${TEST_DIR} #####"
echo ""
- TEST_DIR="$(dirname $test)"
cd "$TEST_DIR" || continue
./test.sh
- cp "$TEST_DIR"/result/output.xml "$ALL_RESULT_DIR"/"$(basename "$TEST_DIR")".xml
+
+ cp "$TEST_DIR"/result/output.xml "$ALL_RESULT_DIR"/"${TEST_NAME}".xml
+ mkdir -p "$ALL_RESULT_DIR"/"${TEST_NAME}"
+ mv "$TEST_DIR"/logs/*log "$ALL_RESULT_DIR"/"${TEST_NAME}"/
done
rebot -N "smoketests" -d "$ALL_RESULT_DIR/" "$ALL_RESULT_DIR/*.xml"
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
index d33194d..5dff226 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
@@ -77,6 +77,13 @@ start_k8s_env() {
wait_for_startup
}
+get_logs() {
+ mkdir -p logs
+ for pod in $(kubectl get pods -o custom-columns=NAME:.metadata.name | tail -n +2); do
+ kubectl logs "${pod}" > "logs/pod-${pod}.log"
+ done
+}
+
stop_k8s_env() {
if [ ! "$KEEP_RUNNING" ]; then
kubectl delete -f .
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org