소스 검색

HDDS-1764. Fix hidden errors in acceptance tests

Closes #1059
Márton Elek 6 년 전
부모
커밋
93824886e9

+ 1 - 1
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

+ 2 - 2
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"]
+    command: ["watch","-n","100000","ls"]

+ 2 - 1
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"