diff --git a/cluster/log-dump.sh b/cluster/log-dump.sh index 3c11c1aebd7..941df1eb5b1 100755 --- a/cluster/log-dump.sh +++ b/cluster/log-dump.sh @@ -105,7 +105,7 @@ function copy-logs-from-node() { gce|gke|kubemark) # get-serial-port-output lets you ask for ports 1-4, but currently (11/21/2016) only port 1 contains useful information gcloud compute instances get-serial-port-output --project "${PROJECT}" --zone "${ZONE}" --port 1 "${node}" > "${dir}/serial-1.log" || true - gcloud compute copy-files --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true + gcloud compute scp --recurse --project "${PROJECT}" --zone "${ZONE}" "${node}:${scp_files}" "${dir}" > /dev/null || true ;; aws) local ip=$(get_ssh_hostname "${node}") diff --git a/test/kubemark/gce/util.sh b/test/kubemark/gce/util.sh index d37ee974a3b..5bb57bbed04 100644 --- a/test/kubemark/gce/util.sh +++ b/test/kubemark/gce/util.sh @@ -113,7 +113,7 @@ function execute-cmd-on-master-with-retries() { } function copy-files() { - run-gcloud-compute-with-retries copy-files --zone="${ZONE}" --project="${PROJECT}" $@ + run-gcloud-compute-with-retries scp --recurse --zone="${ZONE}" --project="${PROJECT}" $@ } function delete-master-instance-and-resources {