github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix kubernetes-e2e-gke build

Browse Source 
Got a little aggressive combining options here. Accidentally forgot
that this parameter would bork normal GKE.
This commit is contained in:
Zach Loafman 2015-01-12 16:52:34 -08:00
parent 26a6628d8a
commit ba618db226
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/jenkins/e2e.sh
View File

@ -46,6 +46,7 @@ echo "E2E_CLUSTER_NAME: ${E2E_CLUSTER_NAME}" # Name of the cluster (e.g. "
echo "E2E_NETWORK: ${E2E_NETWORK}" # Name of the network (e.g. "e2e")
echo "E2E_ZONE: ${E2E_ZONE}" # Name of the GCE zone (e.g. "us-central1-f")
echo "E2E_OPT: ${E2E_OPT}" # hack/e2e.go options
echo "E2E_SET_CLUSTER_API_VERSION: ${E2E_SET_CLUSTER_API_VERSION:-<not set>}" # optional, for GKE, set CLUSTER_API_VERSION to git hash
echo "--------------------------------------------------------------------------------"
# GCE variables
@ -71,8 +72,10 @@ tar -xzf kubernetes.tar.gz
tar -xzf kubernetes-test.tar.gz
cd kubernetes
# This variable is only relevant on GKE-CI
export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
# Set by GKE-CI to change the CLUSTER_API_VERSION to the git version
if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
fi
go run ./hack/e2e.go ${E2E_OPT} -v -down
go run ./hack/e2e.go ${E2E_OPT} -v -up