From 8f5d8da7d6f5d9b6bd553554288f019316d4717d Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Fri, 19 Jun 2015 11:13:55 -0700 Subject: [PATCH] yet another special case for e2e script --- hack/jenkins/e2e.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 5963d66c385..08dfe24e058 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -127,8 +127,16 @@ if [[ "${E2E_UP,,}" == "true" ]]; then # code=400,message=cluster.cluster_api_versionmustbeoneof: # 0.15.0,0.16.0. # The command should error, so we throw an || true on there. - msg=$(gcloud ${CMD_GROUP:-alpha} container clusters create this-wont-work \ - --zone=us-central1-f --cluster-api-version=0.0.0 2>&1 \ + create_args=( + "this-wont-work" + "--zone=us-central1-f" + ) + if [[ ! -z "${DOGFOOD_GCLOUD:-}" ]]; then + create_args+=("--cluster-version=0.0.0") + else + create_args+=("--cluster-api-version=0.0.0") + fi + msg=$(gcloud ${CMD_GROUP:-alpha} container clusters create "$(create_args[@])" 2>&1 \ | tr -d '[[:space:]]') || true # Strip out everything before the final colon, which gives us just # the allowed versions; something like "0.15.0,0.16.0." or "0.16.0."