github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix a few e2e references to allow gke to test dogfood builds

Browse Source
This commit is contained in:
Jeff Lowdermilk 2015-06-18 13:39:51 -07:00
parent 1ba909098e
commit e72431033a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gke/util.sh
View File

@ -99,7 +99,7 @@ function verify-prereqs() {
sudo_prefix="sudo" sudo_prefix="sudo"
fi fi
${sudo_prefix} gcloud ${gcloud_prompt:-} components update preview || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update preview || true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update alpha|| true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update "${CMD_GROUP}"|| true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update kubectl|| true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update kubectl|| true
${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true ${sudo_prefix} gcloud ${gcloud_prompt:-} components update || true
} }

2
hack/jenkins/e2e.sh
View File

@ -127,7 +127,7 @@ 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 alpha container clusters create this-wont-work \ msg=$(gcloud ${CMD_GROUP:-alpha} container clusters create this-wont-work \
--zone=us-central1-f --cluster-api-version=0.0.0 2>&1 \ --zone=us-central1-f --cluster-api-version=0.0.0 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