From 7fb4b89937837f2ef3f8a1921ec98e427079c524 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Fri, 25 Nov 2016 18:18:17 -0500
Subject: [PATCH] ci: Update circleci-matrix to display when each sub-step
 starts and finishes

---
 .circleci-matrix.yml | 44 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
index 531c9ae..48d1cbb 100644
--- a/.circleci-matrix.yml
+++ b/.circleci-matrix.yml
@@ -17,10 +17,23 @@ command:
     if [[ $STEP == "dependencies" ]]; then
       if [[ $CIRCLE_NODE_INDEX == 0 ]]; then
         if [[ ! -f ~/BASE_AVAILABLE ]]; then
-          if [[ -e ~/docker/base.tar ]]; then time docker load -i ~/docker/base.tar; fi
+
+          if [[ -e ~/docker/base.tar ]]; then
+            echo "Loading base.tar from ~/docker cache"
+            time docker load -i ~/docker/base.tar
+            echo "Loading base.tar from ~/docker cache - done"
+          fi
+
+          echo "Pulling dockcross/base"
           time docker pull dockcross/base
+          echo "Pulling dockcross/base - done"
+
           time make base.test
+
+          echo "Saving debian:jessie dockcross/base into ~/docker cache"
           mkdir -p ~/docker; time docker save -o ~/docker/base.tar debian:jessie dockcross/base
+          echo "Saving debian:jessie dockcross/base into ~/docker cache - done"
+
           touch ~/BASE_AVAILABLE
         else
           echo "Base image already available"
@@ -34,9 +47,12 @@ command:
             exit_code=$?
             if [[ $exit_code -eq 0 ]]; then break; elif [[ $exit_code -eq 1 ]]; then echo -n "."; else exit $exit_code;fi
           done
-          echo ""
+          echo "Waiting for node0 - done"
+
           echo "Copying base image from node0"
           mkdir -p ~/docker; time scp node0:~/docker/base.tar ~/docker/base.tar
+          echo "Copying base image from node0 - done"
+
           touch ~/BASE_DOWNLOADED
         else
           echo "Base image already downloaded"
@@ -44,18 +60,38 @@ command:
       fi
     fi
     if [[ $STEP == "test" ]]; then
-      if [[ -e ~/docker/$IMAGE.tar ]]; then time docker load -i ~/docker/$IMAGE.tar; fi
+      if [[ -e ~/docker/$IMAGE.tar ]]; then
+        echo "Loading $IMAGE.tar from ~/docker cache"
+        time docker load -i ~/docker/$IMAGE.tar
+        echo "Loading $IMAGE.tar from ~/docker cache - done"
+      fi
+
+      echo "Pulling dockcross/$IMAGE"
       time docker pull dockcross/$IMAGE
+      echo "Pulling dockcross/$IMAGE - done"
+
+      echo "Loading base.tar from ~/docker cache"
       time docker load -i ~/docker/base.tar
+      echo "Loading base.tar from ~/docker cache - done"
+
       time make $IMAGE.test
+
+      echo "Saving dockcross/$IMAGE into ~/docker cache"
       mkdir -p ~/docker; time docker save dockcross/$IMAGE > ~/docker/$IMAGE.tar
+      echo "Saving dockcross/$IMAGE into ~/docker cache - done"
+
     fi
   - |
     if [[ $STEP == "deployment" ]]; then
       docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       if [[ $CIRCLE_NODE_INDEX == 0 ]] && [[ ! -f ~/BASE_PUSHED ]]; then
+        echo "Pushing dockcross/base"
         time docker push dockcross/base
+        echo "Pulling dockcross/base - done"
         touch ~/BASE_PUSHED
       fi
-      docker push dockcross/$IMAGE
+
+      echo "Pushing dockcross/$IMAGE"
+      time docker push dockcross/$IMAGE
+      echo "Pushing dockcross/$IMAGE - done"
     fi