Skip to content

K
k3s
Commit e5a2e331 authored by Satnam Singh's avatar Satnam Singh
Browse files
Options

Merge pull request #10106 from jlowdermilk/sad-e2e-is-sad

yet another special case for e2e script
parents f02c6855 8f5d8da7
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
hack/jenkins/e2e.sh
View file @ e5a2e331
...@@ -127,8 +127,16 @@ if [[ "${E2E_UP,,}" == "true" ]]; then ...@@ -127,8 +127,16 @@ if [[ "${E2E_UP,,}" == "true" ]]; then
# code=400,message=cluster.cluster_api_versionmustbeoneof: # code=400,message=cluster.cluster_api_versionmustbeoneof:
# 0.15.0,0.16.0. # 0.15.0,0.16.0.
# The command should error, so we throw an || true on there. # The command should error, so we throw an || true on there.
msg=$(gcloud ${CMD_GROUP:-alpha} container clusters create this-wont-work \ create_args=(
--zone=us-central1-f --cluster-api-version=0.0.0 2>&1 \ "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 | tr -d '[[:space:]]') || true
# Strip out everything before the final colon, which gives us just # 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." # the allowed versions; something like "0.15.0,0.16.0." or "0.16.0."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment