github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17069 from jlowdermilk/gke-1.1-features

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-10 18:41:17 -08:00
commit 33a5874d11
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/jenkins/e2e.sh
View File

@ -713,6 +713,21 @@ case ${JOB_NAME} in
)"}
;;
kubernetes-e2e-gke-1.1-features)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-1-1-features"}
: ${E2E_NETWORK:="gke-1-1-features"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${PROJECT:="k8s-jkns-e2e-gke-1-1-features"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=GCE\sL7\sLoadBalancer\sController|Job|Horizontal\spod\sautoscaling"}
# At least n1-standard-2 nodes are required for the cluster to
# have enough cpu/ram to run the Horizontal pod autoscaling tests.
MINION_SIZE="n1-standard-2"
;;
# kubernetes-upgrade-gke
#
# This suite:
@ -1369,6 +1384,7 @@ export KUBE_GKE_NETWORK=${E2E_NETWORK}
export E2E_SET_CLUSTER_API_VERSION=${E2E_SET_CLUSTER_API_VERSION:-}
export DOGFOOD_GCLOUD=${DOGFOOD_GCLOUD:-}
export CMD_GROUP=${CMD_GROUP:-}
export MACHINE_TYPE=${MINION_SIZE:-} # GKE scripts use MACHINE_TYPE for the node vm size
if [[ ! -z "${GKE_API_ENDPOINT:-}" ]]; then
export CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER=${GKE_API_ENDPOINT}