capture-logs

test/e2e/test-cmd.sh

@@ -35,6 +35,12 @@ if [[ $rc -ne 0 ]]; then
   TLS_ARGS=""
 fi
 
+function capture-logs() {
+  echo "initializer logs:"
+  kubectl logs --namespace=kube-system job/initializer || true
+  echo "migrator logs:"
+  kubectl logs --namespace=kube-system deployment/migrator || true
+}
 
 function wait-for-migration()
 {
@@ -63,6 +69,7 @@ function wait-for-migration()
     # Note that number=1 when pendings="".
     number=$(echo "${pendings}" | wc -l)
     if [ -z "${pendings}" ]; then
+      capture-logs
       return 0
     else
       echo "${number} migrations haven't succeeded yet"
@@ -75,10 +82,7 @@ function wait-for-migration()
   done
 
   echo "Timed out waiting for migration to complete."
-  echo "initializer logs:"
-  kubectl logs --namespace=kube-system -l job-name=initializer || true
-  echo "migrator logs:"
-  kubectl logs --namespace=kube-system -l app=migrator || true
+  capture-logs
   return 1
 } 
 

test/e2e/test-fully-automated.sh

@@ -36,6 +36,11 @@ cleanup() {
     return
   fi
   pushd "${MIGRATOR_ROOT}"
+    echo "initializer logs:"
+    kubectl logs --namespace=kube-system job/initializer || true
+    echo "migrator logs:"
+    kubectl logs --namespace=kube-system deployment/migrator || true
+    kubectl get storageversionmigrations.migration.k8s.io --namespace=kube-system -o json
     echo "Deleting images"
     make delete-all-images
     echo "Deleting images successfully"
@@ -59,3 +64,4 @@ pushd "${MIGRATOR_ROOT}"
   make e2e-test
   "${ginkgo}" -v "$@" "${MIGRATOR_ROOT}/test/e2e/e2e.test"
 popd
+