From dd9eabd5f2bad11a15f72658d84b693b7932a5ad Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Wed, 4 Nov 2015 22:42:32 -0800 Subject: [PATCH 1/2] jenkins config for testing 1.1 features on gke --- hack/jenkins/e2e.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index dfc7edd0b47..aea614661fd 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -691,6 +691,19 @@ 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"} + MINION_SIZE="n1-standard-2" + ;; + # kubernetes-upgrade-gke # # This suite: From 58c08307261bf64e9707a97256e9706159fc12cd Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Fri, 6 Nov 2015 11:34:17 -0800 Subject: [PATCH 2/2] Export MINION_SIZE as MACHINE_TYPE for gke tests --- hack/jenkins/e2e.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index aea614661fd..64ec56db7b7 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -701,6 +701,8 @@ case ${JOB_NAME} in : ${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" ;; @@ -1360,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}