Move code coverage inside docker script

ros-industrial · Dec 16, 2020 · 00063ee · 00063ee
1 parent ef8a320
commit 00063ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/industrial_ci/src/ci_main.sh b/industrial_ci/src/ci_main.sh
@@ -60,8 +60,4 @@ fi
 
 ici_hook "after_script"
 
-if [ -n "$CODE_COVERAGE" ] && [ "$IN_DOCKER" = false ]; then
-  ici_run "upload_coverage_report" upload_coverage_report
-fi
-
 ici_exit 0
diff --git a/industrial_ci/src/docker.sh b/industrial_ci/src/docker.sh
@@ -122,6 +122,11 @@ function ici_run_cmd_in_docker() {
     echo "Committing container to tag: '$commit_image'"
     ici_quiet docker commit -m "$DOCKER_COMMIT_MSG" "$cid" "$commit_image"
   fi
+
+  if [ -n "$CODE_COVERAGE" ]; then
+    ici_run "upload_coverage_report" upload_coverage_report
+  fi
+
   ici_quiet docker rm "$cid"
   return $ret
 }