You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/07/10 13:53:11 UTC

[hadoop] 04/05: HDDS-1764. Fix hidden errors in acceptance tests

This is an automated email from the ASF dual-hosted git repository.

elek pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 5dcaa14ff52f604dd2db4a4d37de406935f66085
Author: Márton Elek <el...@apache.org>
AuthorDate: Wed Jul 10 13:22:51 2019 +0200

    HDDS-1764. Fix hidden errors in acceptance tests
    
    Closes #1059
    
    (cherry picked from commit 93824886e9c3323a77e60c0ef5b5b706cdfe1ea8)
---
 hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml       | 2 +-
 hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml | 4 ++--
 hadoop-ozone/dist/src/main/compose/test-all.sh                        | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

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 652d64e..a0d138f 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
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 135da03..31f74f0 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"]
diff --git a/hadoop-ozone/dist/src/main/compose/test-all.sh b/hadoop-ozone/dist/src/main/compose/test-all.sh
index 5039207..7883e87 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"


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org