scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3420 from zmerlynn/fix_cluster_api_version

Browse Source 
Fix kubernetes-e2e-gke build
This commit is contained in:
Zach Loafman
2015-01-12 17:05:15 -08:00
parent 26a6628d8a ba618db226
commit dd24e7e078
1 changed files with 5 additions and 2 deletions
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