From c67774be9bb242eb05a668b5a8e4c243519d8b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Thu, 4 Jul 2019 17:26:14 +0200 Subject: [PATCH 1/3] Print out error message in case of failed test execution. --- hadoop-ozone/dist/src/main/compose/test-all.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/test-all.sh b/hadoop-ozone/dist/src/main/compose/test-all.sh index 5039207d3cd7f..7883e878e7d3d 100755 --- a/hadoop-ozone/dist/src/main/compose/test-all.sh +++ b/hadoop-ozone/dist/src/main/compose/test-all.sh @@ -37,7 +37,8 @@ for test in $(find "$SCRIPT_DIR" -name test.sh); do ./test.sh ret=$? if [[ $ret -ne 0 ]]; then - RESULT=-1 + RESULT=1 + echo "ERROR: Test execution of $(dirname "$test") is FAILED!!!!" fi RESULT_DIR="$(dirname "$test")/result" cp "$RESULT_DIR"/robot-*.xml "$ALL_RESULT_DIR" From afe6afcbf4f961bdb3ba480224e51ff109a3fc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Fri, 5 Jul 2019 02:05:20 +0200 Subject: [PATCH 2/3] fix docker-compose files --- hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml index 652d64e126a8a..a0d138f0bfbe5 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml @@ -49,7 +49,7 @@ services: - ./docker-config command: ["/opt/hadoop/bin/ozone","s3g"] scm: - image: apache/ozone-runner:latest:${HADOOP_RUNNER_VERSION} + image: apache/ozone-runner:${HADOOP_RUNNER_VERSION} hostname: scm volumes: - ../..:/opt/hadoop From 91ef8844af4d62b0b5b2e28c2c8eddd07b4de83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Wed, 10 Jul 2019 13:18:06 +0200 Subject: [PATCH 3/3] fix ozonesecure-mr --- .../dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml index 135da031cf665..31f74f087edda 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml @@ -64,7 +64,7 @@ services: - ./docker-config command: ["/opt/hadoop/bin/ozone","s3g"] scm: - image: apache/ozone-runner:latest:${HADOOP_RUNNER_VERSION} + image: apache/ozone-runner:${HADOOP_RUNNER_VERSION} hostname: scm volumes: - ../..:/opt/hadoop @@ -120,4 +120,4 @@ services: - 4040:4040 env_file: - docker-config - command: ["watch","-n","100000","ls"] \ No newline at end of file + command: ["watch","-n","100000","ls"]