Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gke 1.1 features #17069

Merged
merged 2 commits into from
Nov 11, 2015
Merged

Gke 1.1 features #17069

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd9eabd
jenkins config for testing 1.1 features on gke
j3ffml Nov 5, 2015
58c0830
Export MINION_SIZE as MACHINE_TYPE for gke tests
j3ffml Nov 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,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:
Expand Down Expand Up @@ -1347,6 +1362,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}
Expand Down