Fix up e2e tests.

This commit is contained in:
Max Forbes
2014-12-15 11:15:24 -08:00
parent 2d1b279311
commit bea37d5b17
9 changed files with 74 additions and 83 deletions

View File

@@ -25,9 +25,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
if [[ "$KUBERNETES_PROVIDER" != "gce" ]]; then
echo "PD test is only run for GCE"
return 0
if [[ "$KUBERNETES_PROVIDER" != "gce" ]] && [[ "$KUBERNETES_PROVIDER" != "gke" ]]; then
echo "WARNING: Skipping pd.sh for cloud provider: ${KUBERNETES_PROVIDER}."
exit 0
fi
disk_name="e2e-$(date +%H-%M-%s)"