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

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


The following commit(s) were added to refs/heads/HDDS-3757 by this push:
     new 5cf3e92  collect all the jacoco.exec files
5cf3e92 is described below

commit 5cf3e9257b6efcb9179bc1da762485ff7e6e14ed
Author: Elek Márton <[email protected]>
AuthorDate: Fri Jun 12 11:28:41 2020 +0200

    collect all the jacoco.exec files
---
 hadoop-ozone/dist/src/main/compose/testlib.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh 
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 5948ac9..6df966e 100644
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -110,7 +110,7 @@ execute_robot_test(){
   FULL_CONTAINER_NAME=$(docker-compose -f "$COMPOSE_FILE" ps | grep 
"_${CONTAINER}_" | head -n 1 | awk '{print $1}')
 
   docker cp "$FULL_CONTAINER_NAME:$OUTPUT_PATH" "$RESULT_DIR/"
-  docker cp "$FULL_CONTAINER_NAME:/tmp/jacoco.exec" 
"$RESULT_DIR/$OUTPUT_NAME.jacoco.exec" || true
+  docker cp "$FULL_CONTAINER_NAME:/tmp/jacoco.exec" 
"$RESULT_DIR/$OUTPUT_NAME.$RANDOM.jacoco.exec" || true
 
   copy_daemon_logs
 
@@ -193,6 +193,9 @@ wait_for_port(){
 
 ## @description  Stops a docker-compose based test environment (with saving 
the logs)
 stop_docker_env(){
+  docker-compose -f "$COMPOSE_FILE" --no-ansi ps -q | while read CONTAINER ; do
+    docker cp "$CONTAINER:/tmp/jacoco.exec" 
"$RESULT_DIR/docker-$OUTPUT_NAME.$RANDOM.jacoco.exec"
+  done
   docker-compose -f "$COMPOSE_FILE" --no-ansi logs > 
"$RESULT_DIR/docker-$OUTPUT_NAME.log"
   if [ "${KEEP_RUNNING:-false}" = false ]; then
      docker-compose -f "$COMPOSE_FILE" --no-ansi down


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to